[SCM] calf/master: + autostuff: started using config.h instead of -D switch (watch out for bugs due to config.h not being included)

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:36:58 UTC 2013 

The following commit has been merged in the master branch:
commit 26d946d79a40ba52a544cccfa0a9e51c201a1461
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Sun Jan 13 20:53:25 2008 +0000

    + autostuff: started using config.h instead of -D switch (watch out for bugs due to config.h not being included)
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@96 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/config.h.in b/config.h.in
index 26bb8dd..173cd00 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* "Experimental features are enabled" */
+#undef ENABLE_EXPERIMENTAL
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -57,6 +60,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
+/* Old JACK version (with extra nframes argument) is to be used */
+#undef OLD_JACK
+
 /* Name of package */
 #undef PACKAGE
 
@@ -78,6 +84,30 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* DSSI wrapper will be built */
+#undef USE_DSSI
+
+/* GTK+ GUI for DSSI will be built */
+#undef USE_DSSI_GUI
+
+/* JACK I/O will be used */
+#undef USE_JACK
+
+/* LADSPA wrapper will be built */
+#undef USE_LADSPA
+
+/* "LASH Audio Session Handler client functionality is enabled" */
+#undef USE_LASH
+
+/* LV2 wrapper will be built */
+#undef USE_LV2
+
+/* GTK+ GUI for LV2 plugins will be built */
+#undef USE_LV2_GUI
+
+/* PHAT widget library will be used */
+#undef USE_PHAT
+
 /* Version number of package */
 #undef VERSION
 
diff --git a/configure.ac b/configure.ac
index e3139b8..591d4ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,8 +115,36 @@ AM_CONDITIONAL(USE_DSSI_GUI, test "$DSSI_GUI_ENABLED" = "yes")
 AM_CONDITIONAL(USE_LV2_GUI, test "$LV2_GUI_ENABLED" = "yes")
 AM_CONDITIONAL(USE_PHAT, test "$PHAT_ENABLED" = "yes")
 AM_CONDITIONAL(USE_LASH, test "$LASH_ENABLED" = "yes")
-AM_CONDITIONAL(ENABLE_EXPERIMENTAL, test "$set_enable_experimental" = "yes")
-AM_CONDITIONAL(OLD_JACK, test "$OLD_JACK" = "yes")
+if test "$LADSPA_FOUND" = "yes"; then
+  AC_DEFINE([USE_LADSPA], [1], [LADSPA wrapper will be built])
+fi
+if test "$DSSI_FOUND" = "yes"; then
+  AC_DEFINE(USE_DSSI, 1, [DSSI wrapper will be built])
+fi
+if test "$DSSI_GUI_ENABLED" = "yes"; then
+  AC_DEFINE(USE_DSSI_GUI, 1, [GTK+ GUI for DSSI  will be built])
+fi
+if test "$LV2_ENABLED" = "yes"; then
+  AC_DEFINE(USE_LV2, 1, [LV2 wrapper will be built])
+fi
+if test "$LV2_GUI_ENABLED" = "yes"; then
+  AC_DEFINE(USE_LV2_GUI, 1, [GTK+ GUI for LV2 plugins will be built])
+fi
+if test "$JACK_ENABLED" = "yes"; then
+  AC_DEFINE(USE_JACK, 1, [JACK I/O will be used])
+fi
+if test "$PHAT_ENABLED" = "yes"; then
+  AC_DEFINE(USE_PHAT, 1, [PHAT widget library will be used])
+fi
+if test "$OLD_JACK" = "yes"; then
+  AC_DEFINE(OLD_JACK, 1, [Old JACK version (with extra nframes argument) is to be used])
+fi
+if test "$LASH_ENABLED" = "yes"; then
+  AC_DEFINE(USE_LASH, 1, "LASH Audio Session Handler client functionality is enabled")
+fi
+if test "$set_enable_experimental" = "yes"; then
+  AC_DEFINE([ENABLE_EXPERIMENTAL], [1], "Experimental features are enabled")
+fi
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
diff --git a/src/Makefile.am b/src/Makefile.am
index 94bf061..04e1d1b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,48 +21,23 @@ endif
 AM_CXXFLAGS = -ffast-math -finline-limit=80 -DPKGLIBDIR=\"$(pkglibdir)\"
 
 if USE_JACK
-AM_CXXFLAGS += -DUSE_JACK=1 $(JACK_DEPS_CFLAGS) $(GUI_DEPS_CFLAGS)
+AM_CXXFLAGS += $(JACK_DEPS_CFLAGS) $(GUI_DEPS_CFLAGS)
 noinst_LTLIBRARIES += libcalfgui.la
 bin_PROGRAMS += calfjackhost 
 calfjackhost_SOURCES = jackhost.cpp
 calfjackhost_LDADD = libcalfgui.la libcalfstatic.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS)
-if OLD_JACK
-AM_CXXFLAGS += -DOLD_JACK=1
-endif
 if USE_PHAT
-AM_CXXFLAGS += -DUSE_PHAT=1 $(PHAT_DEPS_CFLAGS)
 calfjackhost_LDADD += $(PHAT_DEPS_LIBS)
 endif
 if USE_LASH
+AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
 calfjackhost_LDADD += $(LASH_DEPS_LIBS)
 endif
 endif
 
-if ENABLE_EXPERIMENTAL
-AM_CXXFLAGS += -DENABLE_EXPERIMENTAL=1
-endif
-
-if USE_LADSPA
-AM_CXXFLAGS += -DUSE_LADSPA=1
-endif
 noinst_PROGRAMS += calfmakerdf
 calfmakerdf_SOURCES = makerdf.cpp
 calfmakerdf_LDADD = libcalfstatic.la
-if USE_DSSI
-AM_CXXFLAGS += -DUSE_DSSI=1
-endif
-if USE_DSSI_GUI
-AM_CXXFLAGS += -DUSE_DSSI_GUI=1
-endif
-if USE_LV2
-AM_CXXFLAGS += -DUSE_LV2=1
-endif
-if USE_LV2_GUI
-AM_CXXFLAGS += -DUSE_LV2_GUI=1
-endif
-if USE_LASH
-AM_CXXFLAGS += -DUSE_LASH=1 $(LASH_DEPS_CFLAGS)
-endif
 
 calfbenchmark_SOURCES = benchmark.cpp
 calfbenchmark_LDADD =  -lglib-2.0
diff --git a/src/gui.cpp b/src/gui.cpp
index 74adcbf..765df0f 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
  
+#include <config.h>
 #include <calf/giface.h>
 #include <calf/gui.h>
 #include <calf/preset.h>
diff --git a/src/modules.cpp b/src/modules.cpp
index af419e5..d2d2098 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -18,6 +18,7 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include <config.h>
 #include <assert.h>
 #include <memory.h>
 #if USE_JACK
diff --git a/src/preset_gui.cpp b/src/preset_gui.cpp
index d95b699..62a23bc 100644
--- a/src/preset_gui.cpp
+++ b/src/preset_gui.cpp
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
  
+#include <config.h>
 #include <map>
 #include <glade/glade.h>
 #include <calf/giface.h>

-- 
calf audio plugins packaging

More information about the pkg-multimedia-commits mailing list