Update configure.ac for modules.

2018-04-06 10:04:25 +01:00 · 2018-04-06 10:04:25 +01:00 · b24dae713b
parent 2004aa2be2
commit b24dae713b
5 changed files with 199 additions and 6 deletions
--- a/configure.ac
+++ b/configure.ac
@ -340,8 +340,8 @@ ac_configure_args="$ac_configure_args --enable-static=yes --enable-shared=no"
 dnl Include "external" headers
 CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/include"

-dnl Include FileDialog
-AC_CONFIG_SUBDIRS([lib-src/FileDialog lib-src/mod-nyq-bench])
+dnl Include FileDialog, mod-nyq-bench, mod-script-pipe and mod-null
+AC_CONFIG_SUBDIRS([lib-src/FileDialog lib-src/mod-nyq-bench lib-src/mod-script-pipe lib-src/mod-null])
 CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/lib-src/FileDialog"
 FILEDIALOG_LIBS='$(top_builddir)/lib-src/FileDialog/libFileDialog.la'
 AC_SUBST([FILEDIALOG_LIBS])
@ -542,7 +542,23 @@ AC_ARG_WITH(portmixer,
  use_portmixer=$withval,
  use_portmixer="yes")

+dnl optional plug-in modules, so only options are off and local.
+  
+AC_ARG_WITH(mod-script-pipe,
+  [AS_HELP_STRING([--with-mod-script-pipe],
+     [compile with mod-script-pipe [default=no]])],
+  use_mod_script_pipe=$withval,
+  use_mod_script_pipe="no")  
+  
+AC_ARG_WITH(mod-nyq-bench,
+  [AS_HELP_STRING([--with-mod-nyq-bench],
+     [compile with mod-nyq-bench [default=no]])],
+  use_mod_nyq_bench=$withval,
+  use_mod_nyq_bench="no")  
+  

+  
+  
 AC_CANONICAL_HOST

 dnl OS-specific configuration
@ -757,6 +773,19 @@ for lib in $LIBRARIES ; do
   fi
 done

+if [[ "$use_mod_script_pipe" = "yes" ]] ; then
+   echo "build module mod-script-pipe: enabled"
+else
+   echo "build module mod-script-pipe: disabled"
+fi
+
+if [[ "$use_mod_nyq_bench" = "yes" ]] ; then
+   echo "build module mod-nyq-bench: enabled"
+else
+   echo "build module mod-nyq-bench: disabled"
+fi
+
+
 if [[ "$use_ladspa" = "yes" ]] ; then
   echo "ladspa plugin support: enabled"
 else
--- a/lib-src/FileDialog/configure.ac
+++ b/lib-src/FileDialog/configure.ac
@ -38,7 +38,7 @@ AC_ARG_ENABLE(debug,
            debug_preference="no")

 AC_ARG_WITH(wx-version,
-            [AS_HELP_STRING([--with-wx-version],[override default wxWidgets version [2.6,2.8]])],
+            [AS_HELP_STRING([--with-wx-version],[override default wxWidgets version [3.1,3.0]])],
            wx_preference="--version=$withval",
            wx_preference="")

@ -48,7 +48,7 @@ AC_ARG_WITH(wx-config,
            wx_config="")

 dnl wxWidgets -- we assume that if wx-config is found, wxWidgets is successfully installed.
-AC_PATH_PROGS(WX_CONFIG, wx-config wx-config-3.0, no, $PATH:/usr/local/bin )
+AC_PATH_PROGS(WX_CONFIG, wx-config wx-config-3.1, no, $PATH:/usr/local/bin )
 if [[ "$WX_CONFIG" = "no" ]] ; then
   AC_MSG_ERROR("Could not find wx-config: is wxWidgets installed? is wx-config in your path?")
 fi
--- a/lib-src/mod-null/configure.ac
+++ b/lib-src/mod-null/configure.ac
@ -0,0 +1,82 @@
+#
+# mod-null
+#
+
+AC_PREREQ([2.59])
+AC_INIT([mod-null],[1.0],[feedback@audacityteam.org],[mod-null])
+AC_CONFIG_AUX_DIR([autotools])
+AC_CONFIG_MACRO_DIR([m4])
+AX_CXX_COMPILE_STDCXX(11)
+
+AM_INIT_AUTOMAKE([1.11 dist-xz foreign no-dist-gzip subdir-objects -Wall])
+AM_MAINTAINER_MODE([disable])
+
+#
+# Checks for programs.
+#
+AC_PROG_CXX
+AM_PROG_AR
+
+LT_INIT([shared],[disable-static])
+AM_PROG_LIBTOOL
+
+#
+# Checks for libraries.
+#
+AC_HEADER_STDC
+
+#
+# Check for debug
+#
+AC_ARG_ENABLE(static-wx,
+            [AS_HELP_STRING([--enable-static-wx],[link wx statically (default=no)])],
+            static_wx_preference="--static=$enableval",
+            static_wx_preference="")
+
+AC_ARG_ENABLE(unicode,
+            [AS_HELP_STRING([--enable-unicode],[enable unicode support (default=no)])],
+            unicode_preference="--unicode=$enableval",
+            unicode_preference="")
+
+AC_ARG_ENABLE(debug,
+            [AS_HELP_STRING([--enable-debug],[enable debug support (default=none)])],
+            debug_preference="--debug=$enableval",
+            debug_preference="")
+
+AC_ARG_WITH(wx-version,
+            [AS_HELP_STRING([--with-wx-version],[override default wxWidgets version [3.1,3.0]])],
+            wx_preference="--version=$withval",
+            wx_preference="")
+
+AC_ARG_WITH(wx-config,
+            [AS_HELP_STRING([--with-wx-config],[override default wxWidgets config script])],
+            wx_config="$withval",
+            wx_config="")
+
+dnl wxWidgets -- we assume that if wx-config is found, wxWidgets is successfully installed.
+AC_PATH_PROGS(WX_CONFIG, wx-config wx-config-3.1, no, $PATH:/usr/local/bin )
+if [[ "$WX_CONFIG" = "no" ]] ; then
+   AC_MSG_ERROR("Could not find wx-config: is wxWidgets installed? is wx-config in your path?")
+fi
+
+dnl Gather wx arguments
+
+wxconfigargs="$static_wx_preference $unicode_preference $debug_preference $wx_preference"
+WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
+WX_LIBS=""
+AC_SUBST([WX_CXXFLAGS])
+AC_SUBST([WX_LIBS])
+
+enable_shared=yes
+enable_static=no
+
+dnl OS-specific configuration
+
+AC_CANONICAL_HOST
+
+AC_CONFIG_FILES([Makefile])
+
+#
+# Write it all out
+#
+AC_OUTPUT
--- a/lib-src/mod-nyq-bench/configure.ac
+++ b/lib-src/mod-nyq-bench/configure.ac
@ -1,5 +1,5 @@
 #
-# FileDialog
+# mod-nyq-bench
 #

 AC_PREREQ([2.59])
@ -44,7 +44,7 @@ AC_ARG_ENABLE(debug,
            debug_preference="")

 AC_ARG_WITH(wx-version,
-            [AS_HELP_STRING([--with-wx-version],[override default wxWidgets version [2.6,2.8]])],
+            [AS_HELP_STRING([--with-wx-version],[override default wxWidgets version [3.1,3.0]])],
            wx_preference="--version=$withval",
            wx_preference="")

--- a/lib-src/mod-script-pipe/configure.ac
+++ b/lib-src/mod-script-pipe/configure.ac
@ -0,0 +1,82 @@
+#
+# mod-script-pipe
+#
+
+AC_PREREQ([2.59])
+AC_INIT([mod-script-pipe],[1.0],[feedback@audacityteam.org],[mod-script-pipe])
+AC_CONFIG_AUX_DIR([autotools])
+AC_CONFIG_MACRO_DIR([m4])
+AX_CXX_COMPILE_STDCXX(11)
+
+AM_INIT_AUTOMAKE([1.11 dist-xz foreign no-dist-gzip subdir-objects -Wall])
+AM_MAINTAINER_MODE([disable])
+
+#
+# Checks for programs.
+#
+AC_PROG_CXX
+AM_PROG_AR
+
+LT_INIT([shared],[disable-static])
+AM_PROG_LIBTOOL
+
+#
+# Checks for libraries.
+#
+AC_HEADER_STDC
+
+#
+# Check for debug
+#
+AC_ARG_ENABLE(static-wx,
+            [AS_HELP_STRING([--enable-static-wx],[link wx statically (default=no)])],
+            static_wx_preference="--static=$enableval",
+            static_wx_preference="")
+
+AC_ARG_ENABLE(unicode,
+            [AS_HELP_STRING([--enable-unicode],[enable unicode support (default=no)])],
+            unicode_preference="--unicode=$enableval",
+            unicode_preference="")
+
+AC_ARG_ENABLE(debug,
+            [AS_HELP_STRING([--enable-debug],[enable debug support (default=none)])],
+            debug_preference="--debug=$enableval",
+            debug_preference="")
+
+AC_ARG_WITH(wx-version,
+            [AS_HELP_STRING([--with-wx-version],[override default wxWidgets version [3.1,3.0]])],
+            wx_preference="--version=$withval",
+            wx_preference="")
+
+AC_ARG_WITH(wx-config,
+            [AS_HELP_STRING([--with-wx-config],[override default wxWidgets config script])],
+            wx_config="$withval",
+            wx_config="")
+
+dnl wxWidgets -- we assume that if wx-config is found, wxWidgets is successfully installed.
+AC_PATH_PROGS(WX_CONFIG, wx-config wx-config-3.1, no, $PATH:/usr/local/bin )
+if [[ "$WX_CONFIG" = "no" ]] ; then
+   AC_MSG_ERROR("Could not find wx-config: is wxWidgets installed? is wx-config in your path?")
+fi
+
+dnl Gather wx arguments
+
+wxconfigargs="$static_wx_preference $unicode_preference $debug_preference $wx_preference"
+WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags)
+WX_LIBS=""
+AC_SUBST([WX_CXXFLAGS])
+AC_SUBST([WX_LIBS])
+
+enable_shared=yes
+enable_static=no
+
+dnl OS-specific configuration
+
+AC_CANONICAL_HOST
+
+AC_CONFIG_FILES([Makefile])
+
+#
+# Write it all out
+#
+AC_OUTPUT