# HG changeset patch
# User Chris Cannam
# Date 1285154855 -3600
# Node ID d59bb887e4d289611ddab13be95e5e9ed48f0bc7
# Parent  41f3e8d56bac80ba717f4ca94afdf0eaa3da68e6
* Update build scripts again; SV now builds (perhaps some problems at runtime still though)

diff -r 41f3e8d56bac -r d59bb887e4d2 acinclude.m4
--- a/acinclude.m4	Wed Sep 22 11:39:37 2010 +0100
+++ b/acinclude.m4	Wed Sep 22 12:27:35 2010 +0100
@@ -35,7 +35,7 @@
    SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
 fi
 if test -n "$PKG_CONFIG"; then
-   PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])])
+   PKG_CHECK_MODULES($1,[$SV_MODULE_VERSION_TEST],[HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $$1_CFLAGS";LIBS="$LIBS $$1_LIBS";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means])])
 fi
 if test -n "$SV_MODULE_FAILED"; then
    AC_CHECK_HEADER([$SV_MODULE_HEADER],[HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""],[AC_MSG_NOTICE([Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE])])
diff -r 41f3e8d56bac -r d59bb887e4d2 config.pri.in
--- a/config.pri.in	Wed Sep 22 11:39:37 2010 +0100
+++ b/config.pri.in	Wed Sep 22 12:27:35 2010 +0100
@@ -6,3 +6,5 @@
 
 LIBS += @LIBS@
 
+linux*: LIBS += -lasound
+
diff -r 41f3e8d56bac -r d59bb887e4d2 configure
--- a/configure	Wed Sep 22 11:39:37 2010 +0100
+++ b/configure	Wed Sep 22 12:27:35 2010 +0100
@@ -6577,7 +6577,7 @@
 	liblo_LIBS=$pkg_cv_liblo_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $liblo_CFLAGS";LIBS="$LIBS $liblo_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -6723,7 +6723,7 @@
 	JACK_LIBS=$pkg_cv_JACK_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $JACK_CFLAGS";LIBS="$LIBS $JACK_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -6869,7 +6869,7 @@
 	libpulse_LIBS=$pkg_cv_libpulse_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $libpulse_CFLAGS";LIBS="$LIBS $libpulse_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -7015,7 +7015,7 @@
 	lrdf_LIBS=$pkg_cv_lrdf_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $lrdf_CFLAGS";LIBS="$LIBS $lrdf_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -7161,7 +7161,7 @@
 	oggz_LIBS=$pkg_cv_oggz_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $oggz_CFLAGS";LIBS="$LIBS $oggz_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -7307,7 +7307,7 @@
 	fishsound_LIBS=$pkg_cv_fishsound_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $fishsound_CFLAGS";LIBS="$LIBS $fishsound_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -7453,7 +7453,7 @@
 	mad_LIBS=$pkg_cv_mad_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $mad_CFLAGS";LIBS="$LIBS $mad_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -7599,7 +7599,7 @@
 	id3tag_LIBS=$pkg_cv_id3tag_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
+	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $id3tag_CFLAGS";LIBS="$LIBS $id3tag_LIBS";SV_MODULE_FAILED=""
 fi
 fi
 if test -n "$SV_MODULE_FAILED"; then
@@ -10022,14 +10022,6 @@
    as_fn_error $? "qmake failed: Command was \"$QMAKE -r\"" "$LINENO" 5
 fi
 
-# qmake builds our static libraries, which is fine -- what we'd really
-# like to do afterwards is bundle them into a single .so with e.g.
-
-# gcc -Wl,--whole-archive */*.a -Wl,--no-whole-archive -o libsvcore.so
-
-# but how best to arrange this? if it's not possible, we'll presumably
-# just have to use a single (q)make(project)file instead.
-
 { $as_echo "$as_me:${as_lineno-$LINENO}:
 
 Configuration complete.
diff -r 41f3e8d56bac -r d59bb887e4d2 configure.ac
--- a/configure.ac	Wed Sep 22 11:39:37 2010 +0100
+++ b/configure.ac	Wed Sep 22 12:27:35 2010 +0100
@@ -109,14 +109,6 @@
    AC_MSG_ERROR([qmake failed: Command was "$QMAKE -r"])
 fi
 
-# qmake builds our static libraries, which is fine -- what we'd really
-# like to do afterwards is bundle them into a single .so with e.g.
-
-# gcc -Wl,--whole-archive */*.a -Wl,--no-whole-archive -o libsvcore.so
-
-# but how best to arrange this? if it's not possible, we'll presumably
-# just have to use a single (q)make(project)file instead.
-
 AC_MSG_NOTICE([
 
 Configuration complete.