From bb12ff83564d43566089dd979639c6993ba76665 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Thu, 6 Jan 2011 00:51:33 +0100 Subject: Apply #ifdefs around functionality not available on win32 And also the reverse: around some win32 specific functionality --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 08c947a7..42d9c3bf 100644 --- a/configure.ac +++ b/configure.ac @@ -390,6 +390,7 @@ AC_CHECK_HEADERS_ONCE([byteswap.h]) AC_CHECK_HEADERS_ONCE([sys/syscall.h]) AC_CHECK_HEADERS_ONCE([sys/eventfd.h]) AC_CHECK_HEADERS_ONCE([execinfo.h]) +AC_CHECK_HEADERS_ONCE([langinfo.h]) #### Typdefs, structures, etc. #### @@ -470,7 +471,7 @@ AC_FUNC_SELECT_ARGTYPES AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \ getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \ pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \ - sigaction sleep sysconf pthread_setaffinity_np]) + sigaction sleep symlink sysconf uname pthread_setaffinity_np]) AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0]) AM_CONDITIONAL(HAVE_MKFIFO, test "x$HAVE_MKFIFO" = "x1") -- cgit From a951c779c6fe0705f75c1dfbe090deb78485b4e8 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 4 Jan 2011 16:48:06 +0100 Subject: Use PCRE if POSIX regex.h is not available --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 42d9c3bf..a2657c08 100644 --- a/configure.ac +++ b/configure.ac @@ -362,10 +362,7 @@ AC_CHECK_HEADERS([netinet/ip.h], [], [], # include #endif ]) -AC_CHECK_HEADERS([regex.h], [HAVE_REGEX=1], [HAVE_REGEX=0]) AC_CHECK_HEADERS([sys/un.h], [HAVE_AF_UNIX=1], [HAVE_AF_UNIX=0]) - -AM_CONDITIONAL(HAVE_REGEX, test "x$HAVE_REGEX" = "x1") AM_CONDITIONAL(HAVE_AF_UNIX, test "x$HAVE_AF_UNIX" = "x1") # Linux @@ -391,6 +388,7 @@ AC_CHECK_HEADERS_ONCE([sys/syscall.h]) AC_CHECK_HEADERS_ONCE([sys/eventfd.h]) AC_CHECK_HEADERS_ONCE([execinfo.h]) AC_CHECK_HEADERS_ONCE([langinfo.h]) +AC_CHECK_HEADERS_ONCE([regex.h pcreposix.h]) #### Typdefs, structures, etc. #### @@ -459,6 +457,8 @@ fi AC_SUBST(HAVE_BONJOUR) AM_CONDITIONAL([HAVE_BONJOUR], [test "x$HAVE_BONJOUR" = x1]) +AC_SEARCH_LIBS([regexec], [pcreposix]) + #### Check for functions #### # ISO @@ -518,6 +518,9 @@ AS_IF([test "$pulseaudio_cv_PTHREAD_PRIO_INHERIT" = "yes"], [ AC_DEFINE_UNQUOTED(PA_CFLAGS,"$CFLAGS", [The CFLAGS used during compilation]) +AC_CHECK_FUNCS([regexec], [HAVE_REGEX=1], [HAVE_REGEX=0]) +AM_CONDITIONAL(HAVE_REGEX, [test "x$HAVE_REGEX" = "x1"]) + #### Large File-Support (LFS) #### AC_SYS_LARGEFILE -- cgit From f2a9fd779e6bfc79d7e6f6f45447e9adbb873c34 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Thu, 17 Feb 2011 11:28:54 +0100 Subject: Give module-waveout a configure switch - Also disable the scary DBus and udev warnings when building for win32 - and only install some dbus/x11 specific files when appropriate --- configure.ac | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a2657c08..8b4f5866 100644 --- a/configure.ac +++ b/configure.ac @@ -878,6 +878,39 @@ fi AC_SUBST(HAVE_SOLARIS) AM_CONDITIONAL([HAVE_SOLARIS], [test "x$HAVE_SOLARIS" = x1]) +#### WaveOut audio support (optional) #### + +AC_ARG_ENABLE([waveout], + AS_HELP_STRING([--disable-waveout],[Disable optional WaveOut audio support]), + [ + case "${enableval}" in + yes) waveout=yes ;; + no) waveout=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-waveout) ;; + esac + ], + [waveout=auto]) + +if test "x${waveout}" != xno ; then + AC_CHECK_HEADERS([mmsystem.h], + [ + HAVE_WAVEOUT=1 + AC_DEFINE([HAVE_WAVEOUT], 1, [Have WaveOut audio?]) + ], + [ + HAVE_WAVEOUT=0 + if test "x$waveout" = xyes ; then + AC_MSG_ERROR([*** WaveOut audio support not found]) + fi + ], + [#include ]) +else + HAVE_WAVEOUT=0 +fi + +AC_SUBST(HAVE_WAVEOUT) +AM_CONDITIONAL([HAVE_WAVEOUT], [test "x$HAVE_WAVEOUT" = x1]) + #### GLib 2 support (optional) #### AC_ARG_ENABLE([glib2], @@ -1529,6 +1562,11 @@ if test "x$HAVE_SOLARIS" = "x1" ; then ENABLE_SOLARIS=yes fi +ENABLE_WAVEOUT=no +if test "x$HAVE_WAVEOUT" = "x1" ; then + ENABLE_WAVEOUT=yes +fi + ENABLE_GTK20=no if test "x$HAVE_GTK20" = "x1" ; then ENABLE_GTK20=yes @@ -1650,6 +1688,7 @@ echo " System Config Path: ${PA_SYSTEM_CONFIG_PATH} Compiler: ${CC} CFLAGS: ${CFLAGS} + LIBS: ${LIBS} Have X11: ${ENABLE_X11} Enable OSS Output: ${ENABLE_OSS_OUTPUT} @@ -1657,6 +1696,7 @@ echo " Enable CoreAudio: ${ENABLE_COREAUDIO} Enable Alsa: ${ENABLE_ALSA} Enable Solaris: ${ENABLE_SOLARIS} + Enable WaveOut: ${ENABLE_WAVEOUT} Enable GLib 2.0: ${ENABLE_GLIB20} Enable Gtk+ 2.0: ${ENABLE_GTK20} Enable GConf: ${ENABLE_GCONF} @@ -1687,7 +1727,7 @@ echo " Preopened modules: ${PREOPEN_MODS} " -if test "${ENABLE_DBUS}" = "no" ; then +if test "${ENABLE_DBUS}" = "no" && test "x$os_is_win32" != "x1" ; then echo " ===== WARNING WARNING WARNING WARNING WARNING WARNING WARNING ===== You do not have DBUS support enabled. It is strongly recommended @@ -1700,7 +1740,7 @@ controling the PulseAudio daemon itself. " fi -if test "${ENABLE_UDEV}" = "no" ; then +if test "${ENABLE_UDEV}" = "no" && test "x$os_is_win32" != "x1" ; then echo " ===== WARNING WARNING WARNING WARNING WARNING WARNING WARNING ===== You do not have udev support enabled. It is strongly recommended -- cgit