Reorganised the source tree. We now have src/ with a couple of subdirs:

[pulseaudio] / configure.ac

diff --git a/configure.ac b/configure.ac
index 710f205b9c2c83007566c81e29d78a046340fd6b..182a2455cc97b2824f7c4c9cf3791abc500bfa78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([polypaudio],[0.8],[mzcbylcnhqvb (at) 0pointer (dot) de])
-AC_CONFIG_SRCDIR([polyp/main.c])
+AC_CONFIG_SRCDIR([src/daemon/main.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
 
@@ -288,13 +288,20 @@ AC_SUBST(LIBSNDFILE_LIBS)
 
 #### OSS support (optional) ####
 
-AC_CHECK_HEADERS([sys/soundcard.h], [HAVE_OSS=1], [HAVE_OSS=0])
+AC_CHECK_HEADERS([sys/soundcard.h], [
+HAVE_OSS=1
+AC_DEFINE([HAVE_OSS], 1, [Have OSS?])
+], [HAVE_OSS=0])
 AC_SUBST(HAVE_OSS)
 AM_CONDITIONAL([HAVE_OSS], [test "x$HAVE_OSS" = x1])
 
+
 #### ALSA support (optional) ####
 
-PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ], [HAVE_ALSA=1], [HAVE_ALSA=0])
+PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ], [
+HAVE_ALSA=1
+AC_DEFINE([HAVE_ALSA], 1, [Have ALSA?])
+], [HAVE_ALSA=0])
 AC_SUBST(ASOUNDLIB_CFLAGS)
 AC_SUBST(ASOUNDLIB_LIBS) 
 AC_SUBST(HAVE_ALSA)
@@ -385,7 +392,7 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
-polyp/Makefile
+src/Makefile
 polyplib.pc
 polyplib-simple.pc
 polyplib-mainloop.pc
@@ -400,7 +407,7 @@ doc/daemon.html
 doc/modules.html
 doxygen/Makefile
 doxygen/doxygen.conf
-polyp/polyplib-version.h
+src/polyp/polyplib-version.h
 doc/FAQ.html
 ])
 AC_OUTPUT