# HG changeset patch
# User cannam
# Date 1234440777 0
# Node ID bdedb6114fc621c10f4825581da7599f4014409f
# Parent  6d355f1b7eaf095a9efbed8cb8d87eac996b8da4
* Fix to prior commit

diff -r 6d355f1b7eaf -r bdedb6114fc6 Makefile.in
--- a/Makefile.in	Thu Feb 12 12:01:58 2009 +0000
+++ b/Makefile.in	Thu Feb 12 12:12:57 2009 +0000
@@ -34,7 +34,7 @@
 #   clean     -- remove binary targets
 #   distclean -- remove all targets
 #
-default: @TARGETS@
+default:	@TARGETS@
 
 # Compile flags
 #
diff -r 6d355f1b7eaf -r bdedb6114fc6 configure
--- a/configure	Thu Feb 12 12:01:58 2009 +0000
+++ b/configure	Thu Feb 12 12:12:57 2009 +0000
@@ -668,6 +668,7 @@
 PKG_CONFIG
 SNDFILE_CFLAGS
 SNDFILE_LIBS
+TARGETS
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1253,6 +1254,12 @@
    esac
   cat <<\_ACEOF
 
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-programs       enable building of example host and RDF generator
+                          [default=yes]
+
 Some influential environment variables:
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
@@ -3950,6 +3957,15 @@
 fi
 
 
+# Check whether --enable-programs was given.
+if test "${enable_programs+set}" = set; then
+  enableval=$enable_programs; PROGS_ARGUMENT=$enableval
+else
+  PROGS_ARGUMENT="yes"
+fi
+
+
+if test "x$PROGS_ARGUMENT" = "xyes" ; then
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -4129,58 +4145,30 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SNDFILE_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (sndfile) were not met:
-
-$SNDFILE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SNDFILE_CFLAGS
-and SNDFILE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (sndfile) were not met:
-
-$SNDFILE_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables SNDFILE_CFLAGS
-and SNDFILE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                have_sndfile="no"
 elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SNDFILE_CFLAGS
-and SNDFILE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables SNDFILE_CFLAGS
-and SNDFILE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+	have_sndfile="no"
 else
 	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
 	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-	:
+	have_sndfile="yes"
 fi
+	if test "x$have_sndfile" = "xyes" ; then
+				TARGETS="sdk plugins host rdfgen test"
+	else
+				{ { echo "$as_me:$LINENO: error: libsndfile not found - cannot build example Vamp host!" >&5
+echo "$as_me: error: libsndfile not found - cannot build example Vamp host!" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
+else
+		TARGETS="sdk plugins"
+fi
+
+
 
 
 
@@ -4191,6 +4179,7 @@
   esac
 fi
 
+
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
@@ -4874,11 +4863,12 @@
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 SNDFILE_CFLAGS!$SNDFILE_CFLAGS$ac_delim
 SNDFILE_LIBS!$SNDFILE_LIBS$ac_delim
+TARGETS!$TARGETS$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 6d355f1b7eaf -r bdedb6114fc6 configure.ac
--- a/configure.ac	Thu Feb 12 12:01:58 2009 +0000
+++ b/configure.ac	Thu Feb 12 12:12:57 2009 +0000
@@ -22,8 +22,7 @@
 
 dnl if the user wants progs, then we need to check for libsndfile
 if test "x$PROGS_ARGUMENT" = "xyes" ; then 
-	PKG_CHECK_MODULES([SNDFILE],[sndfile], 
-					  have_sndfile="yes", have_sndfile="no")
+	PKG_CHECK_MODULES([SNDFILE],[sndfile],have_sndfile="yes",have_sndfile="no")
 	if test "x$have_sndfile" = "xyes" ; then
 		dnl all good, build everything
 		TARGETS="sdk plugins host rdfgen test"
@@ -38,6 +37,7 @@
 
 AC_SUBST(SNDFILE_CFLAGS)
 AC_SUBST(SNDFILE_LIBS)
+AC_SUBST(TARGETS)
 
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
@@ -48,5 +48,6 @@
 fi
 changequote([,])dnl
 
+AC_SUBST(CXXFLAGS)
 AC_OUTPUT([Makefile])