X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=ac4192f2ecb276435cdb0e54bed659f4596a634c;hb=5597f7555575ba0cf1955b102403f04fa1115c10;hp=80fff1e016f690fe55814ee2d5c21e3b60383269;hpb=9bfd946422ec369c4fd91aa1c674cfb277e8cd9f;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 80fff1e0..ac4192f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,58 +385,23 @@ AC_CHECK_HEADER(alsa/asoundlib.h, [], HAVE_ALSA=no)
 AC_CHECK_LIB([asound], [snd_pcm_open], [], HAVE_ALSA=no)
 LIB_SUBST_FLAGS(alsa)
 UNSTASH_FLAGS
+######################################################################### pthread
+STASH_FLAGS
+LIB_ARG_WITH([pthread], [-lpthread])
+HAVE_PTHREAD=yes
+AC_CHECK_HEADER(pthread.h, [], HAVE_PTHREAD=no)
+AC_CHECK_LIB([pthread], [pthread_create], [], HAVE_PTHREAD=no)
+LIB_SUBST_FLAGS(pthread)
+UNSTASH_FLAGS
 ########################################################################### libao
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_ao="yes"
-AC_ARG_WITH(ao_headers, [AS_HELP_STRING(--with-ao-headers=dir,
-	[look for ao/ao.h also in dir])])
-if test -n "$with_ao_headers"; then
-	ao_cppflags="-I$with_ao_headers"
-	CPPFLAGS="$CPPFLAGS $ao_cppflags"
-fi
-AC_ARG_WITH(ao_libs, [AS_HELP_STRING(--with-ao-libs=dir,
-	[look for libao also in dir])])
-if test -n "$with_ao_libs"; then
-	ao_libs="-L$with_ao_libs"
-	LDFLAGS="$LDFLAGS $ao_libs"
-fi
-msg="no libao support for para_audiod/para_write"
-AC_CHECK_HEADERS([ao/ao.h], [
-	], [
-	have_ao="no"
-	AC_MSG_WARN([ao.h not found, $msg])
-])
-if test "$have_ao" = "yes"; then
-	AC_CHECK_LIB([ao], [ao_initialize], [], [
-		have_ao="no"
-		AC_MSG_WARN([ao lib not found or not working, $msg])
-	])
-fi
-if test "$have_ao" = "yes"; then
-	AC_CHECK_HEADERS([pthread.h], [
-		], [
-		have_ao="no"
-		AC_MSG_WARN([pthread.h not found, $msg])
-	])
-fi
-if test "$have_ao" = "yes"; then
-	AC_CHECK_LIB([pthread], [pthread_create], [], [
-		have_ao="no"
-		AC_MSG_WARN([pthread lib not found or not working, $msg])
-	])
-fi
-if test "$have_ao" = "yes"; then
-	AC_SUBST(ao_cppflags)
-	ao_ldflags="$ao_libs -lao -lpthread"
-	AC_SUBST(ao_ldflags)
-fi
-
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([ao], [-lao])
+HAVE_AO=yes
+AC_CHECK_HEADER(ao/ao.h, [], HAVE_AO=no)
+AC_CHECK_LIB([ao], [ao_initialize], [], HAVE_AO=no)
+LIB_SUBST_FLAGS(ao)
+UNSTASH_FLAGS
+AC_DEFUN([NEED_AO_OBJECTS], [{ test $HAVE_AO = yes -a $HAVE_PTHREAD = yes; }])
 ############################################################# readline
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LDFLAGS="$LDFLAGS"
@@ -734,10 +699,10 @@ if test -n "$CRYPTOLIB"; then
 		audiod_errlist_objs="$audiod_errlist_objs alsa_write"
 		audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
 	fi
-	if test "$have_ao" = "yes"; then
+	NEED_AO_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs ao_write"
 		audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
-	fi
+	}
 	if test "$have_samplerate" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
 		audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
@@ -1081,10 +1046,10 @@ if test $HAVE_ALSA = yes; then
 	play_errlist_objs="$play_errlist_objs alsa_write"
 	play_cmdline_objs="$play_cmdline_objs alsa_write"
 fi
-if test "$have_ao" = "yes"; then
+NEED_AO_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs ao_write"
 	play_cmdline_objs="$play_cmdline_objs ao_write"
-fi
+}
 if test "$have_readline" = "yes"; then
 	play_errlist_objs="$play_errlist_objs interactive"
 fi
@@ -1125,12 +1090,12 @@ if test "$have_core_audio" = "yes"; then
 	writers="$writers osx"
 	default_writer="OSX_WRITE"
 fi
-if test "$have_ao" = "yes"; then
+NEED_AO_OBJECTS && {
 	write_errlist_objs="$write_errlist_objs ao_write"
 	write_cmdline_objs="$write_cmdline_objs ao_write"
 	writers="$writers ao"
 	default_writer="AO_WRITE"
-fi
+}
 if test "$have_oss" = "yes"; then
 	write_errlist_objs="$write_errlist_objs oss_write"
 	write_cmdline_objs="$write_cmdline_objs oss_write"