- system-libs patch: switched back to included gtk-canvas

- ac_cleanup patch: removes unneeded definitions in configure.ac

Changed files:
    ardour-ac_cleanup.patch -> 1.1
    ardour-system-libs.patch -> 1.3

diff --git a/ardour-ac_cleanup.patch b/ardour-ac_cleanup.patch
new file mode 100644 (file)
index 0000000..3e90583
--- /dev/null
+++ b/ardour-ac_cleanup.patch
@@ -0,0 +1,15 @@
+diff -aurN ardour-0.9beta5.orig/libs/ardour/configure.ac ardour-0.9beta5/libs/ardour/configure.ac
+--- ardour-0.9beta5.orig/libs/ardour/configure.ac      2003-10-10 22:33:23.000000000 +0200
++++ ardour-0.9beta5/libs/ardour/configure.ac   2003-10-11 13:05:34.769207648 +0200
+@@ -120,11 +120,6 @@
+ CFLAGS="$CFLAGS $GLIB_CFLAGS $JACK_CFLAGS $LRDF_CFLAGS $XML_CFLAGS $CONFIGDIR $DATADIR"
+ CXXFLAGS="$CXXFLAGS $GLIB_CFLAGS $JACK_CFLAGS $LRDF_CFLAGS $XML_CFLAGS $CONFIGDIR $DATADIR"
+ 
+-dnl clean up those argument lists a bit ...
+-AC_UNIQUIFY_FIRST([$CXXFLAGS],[CXXFLAGS])
+-AC_UNIQUIFY_FIRST([$CFLAGS],[CFLAGS])
+-AC_UNIQUIFY_LAST([$LIBS],[LIBS])
+-
+ AC_OUTPUT(Makefile 
+           intl/Makefile 
+           po/Makefile.in 

diff --git a/ardour-system-libs.patch b/ardour-system-libs.patch
index f1892ad2ed92904c0c6b48c29f4ccb323867fa3e..a5dde3a8d3b089a1244f59176dffa12640d2730a 100644 (file)
--- a/ardour-system-libs.patch
+++ b/ardour-system-libs.patch
@@ -5,7 +5,7 @@
  ARDOUR_TOP=`cd $ARDOUR_TOP; pwd`
  
 -export LIBDIRS="sigc++ pbd soundtouch midi++ ardour gtkmm gtkmmext gtk-canvas"
-+export LIBDIRS="pbd soundtouch midi++ ardour gtkmmext"
++export LIBDIRS="pbd soundtouch midi++ ardour gtkmmext gtk-canvas"
  
  ACLOCAL_FLAGS="-I $ARDOUR_TOP/aclocal"
  ACLOCAL_AMFLAGS="-I $ARDOUR_TOP/aclocal `if test -d m4 ; then echo -I m4; fi`"
@@ -21,8 +21,8 @@
 -LIBS="$LIBS $ARDOUR_TOP/libs/soundtouch/libsoundtouch.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a $ARDOUR_TOP/libs/sigc++/sigc++/libsigc.a"
 +BASE_LIBS="$ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a `sigc-config --libs`"
 +BASE_INCLUDES="`sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TIP/libs/soundtouch"
-+GUI_LIBS="$ARDOUR_TOP/libs/gtkmmext/libgtkmmext.a $ARDOUR_TOP/libs/midi++/libmidipp.a -lgtk-canvas `gtkmm-config --libs`"
-+GUI_INCLUDES="-I$ARDOUR_TOP/libs/ -I$ARDOUR_TOP/libs/gtkmmext `gtkmm-config --cflags`"
++GUI_LIBS="$ARDOUR_TOP/libs/gtkmmext/libgtkmmext.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/gtk-canvas/libgtk-canvas.a `gtkmm-config --libs`"
++GUI_INCLUDES="-I$ARDOUR_TOP/libs/ -I$ARDOUR_TOP/libs/gtk-canvas -I$ARDOUR_TOP/libs/gtk-canvas/gtk-canvas -I$ARDOUR_TOP/libs/gtkmmext `gtkmm-config --cflags`"
 +CFLAGS="$CFLAGS `sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch"
 +CXXFLAGS="$CXXFLAGS `sigc-config --cflags` -I$ARDOUR_TOP/libs/pbd -I$ARDOUR_TOP/libs/midi++ -I$ARDOUR_TOP/libs/ardour -I$ARDOUR_TOP/libs/soundtouch"
 +LIBS="$LIBS $ARDOUR_TOP/libs/soundtouch/libsoundtouch.a $ARDOUR_TOP/libs/midi++/libmidipp.a $ARDOUR_TOP/libs/pbd/libpbd.a `sigc-config --libs`"
@@ -39,7 +39,7 @@
  
  if test x$WITH_GTK_GUI != x ; then
 -   AC_CONFIG_SUBDIRS(gtkmm gtkmmext gtk-canvas)
-+   AC_CONFIG_SUBDIRS(gtkmmext)
++   AC_CONFIG_SUBDIRS(gtkmmext gtk-canvas)
  fi
  
  if test x$WITH_VST_WIN != x ; then