[SCM] calf/master: + autotools: added configure check for LV2 (unused for now, but hope to use it some day) + autotools: made DSSI GUI optional, rearranged (fixed?) dependencies + autotools: calfmakerdf is not installed in $bindir anymore (it's only used during installation anyway)

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

The following commit has been merged in the master branch:
commit f50e339899745b85d191244fd33651be43b3383d
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Mon Jan 7 23:21:30 2008 +0000

    + autotools: added configure check for LV2 (unused for now, but hope to use it some day)
    + autotools: made DSSI GUI optional, rearranged (fixed?) dependencies
    + autotools: calfmakerdf is not installed in $bindir anymore (it's only used during installation anyway)
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@81 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/configure.in b/configure.in
index 16c67bc..61d35eb 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([calf],[0.0.10],[wdev at foltman.com])
+AC_INIT([calf],[0.0.11],[wdev at foltman.com])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 
@@ -54,16 +54,30 @@ AC_SUBST(GUI_DEPS_LIBS)
 AC_SUBST(JACK_DEPS_CFLAGS)
 AC_SUBST(JACK_DEPS_LIBS)
 
+PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 1, LV2_ENABLED="yes", LV2_ENABLED="no")
+
 PHAT_ENABLED="no"
-if test "$JACK_FOUND" = "yes"; then
+if test "$JACK_FOUND" = "yes" -o "$DSSI_FOUND" = "yes" -o "$LV2_ENABLED" = "yes"; then
   PKG_CHECK_MODULES(GUI_DEPS, gtk+-2.0 >= 2.8.0 libglade-2.0 >= 2.4.0 cairo >= 1.2.0,
-    JACK_ENABLED="yes",
-    JACK_ENABLED="no (GTK+ 2.8, cairo 1.2 and libglade 2.4.0 or newer required)"
+    GUI_ENABLED="yes",
+    GUI_ENABLED="no (GTK+ 2.8, cairo 1.2 and libglade 2.4.0 or newer required)"
   )
 else
+  GUI_ENABLED="no"
+fi
+
+if test "$GUI_ENABLED" = "yes" -a "$JACK_FOUND" = "yes"; then
+  JACK_ENABLED="yes"
+else
   JACK_ENABLED="no"
 fi
 
+if test "$GUI_ENABLED" = "yes" -a "$DSSI_FOUND" = "yes"; then
+  DSSI_GUI_ENABLED="yes"
+else
+  DSSI_GUI_ENABLED="no"
+fi
+
 if test "$JACK_ENABLED" = "yes"; then
   PKG_CHECK_MODULES(PHAT_DEPS, phat >= 0.4.1, 
     [
@@ -88,6 +102,9 @@ AC_MSG_RESULT($set_enable_experimental)
 AM_CONDITIONAL(USE_DSSI, test "$DSSI_FOUND" = "yes")
 AM_CONDITIONAL(USE_LADSPA, test "$LADSPA_FOUND" = "yes")
 AM_CONDITIONAL(USE_JACK, test "$JACK_ENABLED" = "yes")
+AM_CONDITIONAL(USE_LV2, test "$LV2_ENABLED" = "yes")
+AM_CONDITIONAL(USE_GUI, test "$GUI_ENABLED" = "yes")
+AM_CONDITIONAL(USE_DSSI_GUI, test "$DSSI_GUI_ENABLED" = "yes")
 AM_CONDITIONAL(USE_PHAT, test "$PHAT_ENABLED" = "yes")
 AM_CONDITIONAL(ENABLE_EXPERIMENTAL, test "$set_enable_experimental" = "yes")
 AM_CONDITIONAL(OLD_JACK, test "$OLD_JACK" = "yes")
@@ -140,9 +157,11 @@ AC_MSG_RESULT([
 
     LADSPA enabled:         $LADSPA_FOUND
     DSSI enabled:           $DSSI_FOUND
+    DSSI GUI enabled:       $DSSI_GUI_ENABLED
     JACK host enabled:      $JACK_ENABLED
+    LV2 enabled:            $LV2_ENABLED (unused for now)
     Old-style JACK MIDI:    $OLD_JACK
-    PHAT library enabled:   $PHAT_ENABLED
+    PHAT GUI enabled:       $PHAT_ENABLED
     
     Installation prefix:    $prefix
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 85980f6..f93b7a6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,8 +8,11 @@ ladspadir = $(with_ladspa_dir)
 
 bin_PROGRAMS = 
 
-noinst_PROGRAMS = calfbenchmark calfdssigui
+noinst_PROGRAMS = calfbenchmark
 noinst_LTLIBRARIES = calf.la libcalfstatic.la
+if USE_DSSI_GUI
+noinst_PROGRAMS += calfdssigui
+endif
 
 AM_CXXFLAGS = -ffast-math -march=i686 -finline-limit=80 -DPKGLIBDIR=\"$(pkglibdir)\"
 
@@ -33,19 +36,24 @@ endif
 
 if USE_LADSPA
 AM_CXXFLAGS += -DUSE_LADSPA=1
-bin_PROGRAMS += calfmakerdf
+noinst_PROGRAMS += calfmakerdf
 calfmakerdf_SOURCES = makerdf.cpp
 calfmakerdf_LDADD = libcalfstatic.la
 endif
 if USE_DSSI
 AM_CXXFLAGS += -DUSE_DSSI=1
 endif
+if USE_DSSI_GUI
+AM_CXXFLAGS += -DUSE_DSSI_GUI=1
+endif
 
 calfbenchmark_SOURCES = benchmark.cpp
-calfbenchmark_LDADD =  -lglib-2.0 libcalfgui.la
+calfbenchmark_LDADD =  -lglib-2.0
 
+if USE_DSSI_GUI
 calfdssigui_SOURCES = dssigui.cpp
 calfdssigui_LDADD =  -lglib-2.0 libcalfstatic.la libcalfgui.la $(GUI_DEPS_LIBS)
+endif
 
 calf_la_SOURCES = modules.cpp giface.cpp monosynth.cpp organ.cpp preset.cpp synth.cpp 
 calf_la_LDFLAGS = -rpath $(ladspadir) -avoid-version -module -lexpat
@@ -53,8 +61,10 @@ calf_la_LDFLAGS = -rpath $(ladspadir) -avoid-version -module -lexpat
 libcalfstatic_la_SOURCES = modules.cpp giface.cpp monosynth.cpp organ.cpp preset.cpp synth.cpp
 libcalfstatic_la_LDFLAGS = -static -lexpat
 
+if USE_GUI
 libcalfgui_la_SOURCES = gui.cpp preset_gui.cpp custom_ctl.cpp osctl.cpp
 libcalfgui_la_LDFLAGS = -static
+endif
 
 clean-local:
 	$(RM) -f calfjackhost *~
@@ -70,14 +80,16 @@ if USE_LADSPA
 	install -d -m 755 $(DESTDIR)$(with_ladspa_dir)
 	install -d -m 755 $(DESTDIR)$(with_ladspa_rdf_dir)
 	install -c -m 755 $(top_builddir)/src/.libs/calf.so $(DESTDIR)$(with_ladspa_dir)/calf.so
-	$(DESTDIR)$(bindir)/calfmakerdf > $(DESTDIR)$(with_ladspa_rdf_dir)/calf.rdf
+	$(top_builddir)/src/calfmakerdf > $(DESTDIR)$(with_ladspa_rdf_dir)/calf.rdf
 endif
 if USE_DSSI
 	install -d -m 755 $(DESTDIR)$(with_dssi_dir)
 	install -d -m 755 $(DESTDIR)$(with_dssi_dir)/calf
 	install -c -m 755 $(top_builddir)/src/.libs/calf.so $(DESTDIR)$(with_dssi_dir)/calf.so
+if USE_DSSI_GUI
 	install -c -m 755 $(top_builddir)/src/calfdssigui $(DESTDIR)$(with_dssi_dir)/calf/calf_gtk
 endif
+endif
 
 #remove calf.so, calf.rdf and - if empty - ladspa dir in usr/share
 uninstall-hook:
@@ -94,7 +106,9 @@ if USE_LADSPA
 endif
 if USE_DSSI
 	$(RM) -f $(DESTDIR)$(with_dssi_dir)/calf.so
+if USE_DSSI_GUI
 	$(RM) -f $(DESTDIR)$(with_dssi_dir)/calf/calf_gtk
+endif
 	$(RMDIR) -f $(DESTDIR)$(with_dssi_dir)/calf
 endif
 

-- 
calf audio plugins packaging

More information about the pkg-multimedia-commits mailing list