diff -Naur emu-1.10.5/configure.in emu-1.10.5-g/configure.in --- emu-1.10.5/configure.in 2005-12-06 12:16:04.000000000 +0000 +++ emu-1.10.5-g/configure.in 2006-07-08 20:36:18.000000000 +0000 @@ -162,11 +162,13 @@ # #-------------------------------------------------------------------- +AC_MSG_CHECKING([whether to enable estools]) AC_ARG_WITH( estools, [ --with-estools use the Edinburgh Speech Tools library for file i/o, usage: --with-estools=/path/to/speech_tools], EDINBURGH_DIR=$with_estools ) +AC_MSG_RESULT($with_estools) -if eval "test x$with_estools != x"; then +if eval "test x$with_estools != x -a x$with_estools != xno"; then TRACK_INCLUDE="$TRACK_INCLUDE -DWITH_EDINBURGH -I$EDINBURGH_DIR/include " TRACK_LIB="$TRACK_LIB -L$EDINBURGH_DIR/lib -lestools -leststring -lestbase " fi @@ -176,11 +178,13 @@ # #-------------------------------------------------------------------- +AC_MSG_CHECKING([whether to enable esps]) AC_ARG_WITH( esps, [ --with-esps use the Entropic ESPS libraries for file i/o, usage: --with-esps=/path/to/esps], ESPS_DIR=$with_esps ) +AC_MSG_RESULT($with_esps) -if eval "test x$with_esps != x"; then +if eval "test x$with_esps != x -a x$with_esps != xno"; then TRACK_INCLUDE="$TRACK_INCLUDE -DUSE_ESPS -I$ESPS_DIR/include" TRACK_LIB="$TRACK_LIB -L$ESPS_DIR/lib -lhdre -lespsg $SOCKET_LIBS" fi @@ -191,14 +195,16 @@ # #-------------------------------------------------------------------- +AC_MSG_CHECKING([whether to enable NIST SPHERE support]) AC_ARG_WITH( nist, [ --with-nist use the NIST SPHERE toolkit for file i/o, usage: --with-nist=/path/to/nist], NIST_DIR="$with_nist" ) +AC_MSG_RESULT($with_nist) # if we have esps, we don't need to link against the nist libraries -if eval "test x$with_nist != x"; then +if eval "test x$with_nist != x -a x$with_nist != xno"; then TRACK_INCLUDE="$TRACK_INCLUDE -DWITH_NIST -I$NIST_DIR/include " - if eval "test x$with_esps = x"; then + if eval "test x$with_esps = x -a x$with_esps != xno"; then TRACK_LIB="$TRACK_LIB $NIST_DIR/lib/libsp.a $NIST_DIR/lib/libutil.a -lm " fi fi @@ -426,11 +432,13 @@ # need to choose between Sun and Linux sound support, or no support at all #----------------------------------------------------------------------- +AC_MSG_CHECKING([whether to enable nas support]) AC_ARG_WITH( nas, [ --with-nas include support for NAS audio playback, usage: --with-nas=/path/to/nas], NAS_DIR=$with_nas ) +AC_MSG_RESULT($with_nas) -if eval "test x$with_nas != x"; then +if eval "test x$with_nas != x -a x$with_nas != xno"; then NAS_DEFINES="-DWITH_NAS -I$NAS_DIR/usr.include" NAS_LIB="$NAS_DIR/lib/audio/libaudio.a -L$x_libraries -lXau $SOCKET_LIBS" NAS_OBJ=nas-sound.o