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 20d9b8664ad8530754ed10436c3a5c23486cca74..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])
 
@@ -43,15 +43,6 @@ AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 AC_GNU_SOURCE
 
-# If using GCC specify some additional parameters
-if test "x$GCC" = "xyes" ; then
-   CFLAGS="$CFLAGS -pipe -W -Wall -pedantic"
-
-   AC_LANG_CONFTEST([int main() {}])
-   $CC -c conftest.c -std=gnu9x -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -std=gnu9x -Wno-unused-parameter"
-   rm -f conftest.o
-fi
-
 # M4
 
 AC_PATH_PROG([M4], [m4 gm4], [no])
@@ -72,29 +63,9 @@ test_gcc_flag() {
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
 
-    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline"
-
-    if test "x$HAVE_NETLINK" = "xyes" ; then
-        # Test whether rtnetlink.h can be included when compiled with -std=c99
-        # some distributions (e.g. archlinux) have broken headers that dont
-        # define __u64 with -std=c99
-        AC_MSG_CHECKING([checking whether rtnetlink.h can be included with -std=c99])
-        OLDCFLAGS="$CFLAGS"
-        CFLAGS="-std=c99"
-        AC_TRY_COMPILE([#include <linux/rtnetlink.h>], [],
-            use_stdc99=yes, use_stdc99=no)
-
-        if test x"$use_stdc99" = xyes; then
-            DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS"
-            AC_MSG_RESULT([yes])
-        else
-            AC_MSG_RESULT([no])
-        fi
-
-        CFLAGS="$OLDCFLAGS"
-    else
-        DESIRED_FLAGS="-std=c99 $DESIRED_FLAGS"
-    fi
+    # We use gnu99 instead of c99 because many have interpreted the standard
+    # in a way that int64_t isn't defined on non-64 bit platforms.
+    DESIRED_FLAGS="-std=gnu99 -Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Winline -Wno-unused-parameter"
 
     for flag in $DESIRED_FLAGS ; do
         AC_MSG_CHECKING([whether $CC accepts $flag])
@@ -214,13 +185,13 @@ AC_CHECK_DEFINE([INADDR_NONE], [netinet/in.h], [],
 #### Check for libs ####
 
 # ISO
-AC_CHECK_LIB([m], [pow])
+AC_SEARCH_LIBS([pow], [m])
 
 # POSIX
-AC_CHECK_LIB([rt], [sched_setscheduler])
+AC_SEARCH_LIBS([sched_setscheduler], [rt])
 
 # BSD
-AC_CHECK_LIB([socket], [connect])
+AC_SEARCH_LIBS([connect], [socket])
 
 # Non-standard
 
@@ -287,10 +258,9 @@ AC_ARG_WITH(
         AC_HELP_STRING([--without-caps],[Omit support for POSIX capabilities.]))
 
 if test "x${with_caps}" != "xno"; then
-    AC_CHECK_LIB(cap, cap_init, [CAP_LIBS='-lcap'], [CAP_LIBS=''])
+    AC_SEARCH_LIBS([cap_init], [cap])
     AC_CHECK_HEADERS([sys/capability.h])
 fi
-AC_SUBST(CAP_LIBS)
 
 #### pkg-config ####
 
@@ -318,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)
@@ -360,6 +337,11 @@ AC_SUBST(HOWL_LIBS)
 AC_SUBST(HAVE_HOWL)
 AM_CONDITIONAL([HAVE_HOWL], [test "x$HAVE_HOWL" = x1])
 
+
+PKG_CHECK_MODULES(LIBOIL, [ liboil-0.3 >= 0.3.0 ])
+AC_SUBST(LIBOIL_CFLAGS)
+AC_SUBST(LIBOIL_LIBS)
+
 #### Async DNS support (optional) ####
 
 PKG_CHECK_MODULES(LIBASYNCNS, [ libasyncns >= 0.1 ], HAVE_LIBASYNCNS=1, HAVE_LIBASYNCNS=0)
@@ -410,7 +392,7 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
-polyp/Makefile
+src/Makefile
 polyplib.pc
 polyplib-simple.pc
 polyplib-mainloop.pc
@@ -425,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