comparison configure.ac @ 278:bdedb6114fc6

* Fix to prior commit
author cannam
date Thu, 12 Feb 2009 12:12:57 +0000
parents 6d355f1b7eaf
children ebc47e614cf5
comparison
equal deleted inserted replaced
277:6d355f1b7eaf 278:bdedb6114fc6
20 PROGS_ARGUMENT=$enableval, 20 PROGS_ARGUMENT=$enableval,
21 PROGS_ARGUMENT="yes") 21 PROGS_ARGUMENT="yes")
22 22
23 dnl if the user wants progs, then we need to check for libsndfile 23 dnl if the user wants progs, then we need to check for libsndfile
24 if test "x$PROGS_ARGUMENT" = "xyes" ; then 24 if test "x$PROGS_ARGUMENT" = "xyes" ; then
25 PKG_CHECK_MODULES([SNDFILE],[sndfile], 25 PKG_CHECK_MODULES([SNDFILE],[sndfile],have_sndfile="yes",have_sndfile="no")
26 have_sndfile="yes", have_sndfile="no")
27 if test "x$have_sndfile" = "xyes" ; then 26 if test "x$have_sndfile" = "xyes" ; then
28 dnl all good, build everything 27 dnl all good, build everything
29 TARGETS="sdk plugins host rdfgen test" 28 TARGETS="sdk plugins host rdfgen test"
30 else 29 else
31 dnl no libsndfile - can't build host! 30 dnl no libsndfile - can't build host!
36 TARGETS="sdk plugins" 35 TARGETS="sdk plugins"
37 fi 36 fi
38 37
39 AC_SUBST(SNDFILE_CFLAGS) 38 AC_SUBST(SNDFILE_CFLAGS)
40 AC_SUBST(SNDFILE_LIBS) 39 AC_SUBST(SNDFILE_LIBS)
40 AC_SUBST(TARGETS)
41 41
42 changequote(,)dnl 42 changequote(,)dnl
43 if test "x$GCC" = "xyes"; then 43 if test "x$GCC" = "xyes"; then
44 case " $CXXFLAGS " in 44 case " $CXXFLAGS " in
45 *[\ \ ]-fPIC\ -Wall[\ \ ]*) ;; 45 *[\ \ ]-fPIC\ -Wall[\ \ ]*) ;;
46 *) CXXFLAGS="$CXXFLAGS -fPIC -Wall" ;; 46 *) CXXFLAGS="$CXXFLAGS -fPIC -Wall" ;;
47 esac 47 esac
48 fi 48 fi
49 changequote([,])dnl 49 changequote([,])dnl
50 50
51 AC_SUBST(CXXFLAGS)
51 AC_OUTPUT([Makefile]) 52 AC_OUTPUT([Makefile])
52 53