extend maximum sink/source name length, because HAL UDIs can get ridiculously long

[pulseaudio] / configure.ac

diff --git a/configure.ac b/configure.ac
index a7f85ea0e663db2ce43fd53a19169bb28b32d501..68d9d5d52133f41d30fb4646926547eddba24acf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_PREREQ(2.57)
 
 m4_define(PA_MAJOR, [0])
 m4_define(PA_MINOR, [9])
-m4_define(PA_MICRO, [2])
+m4_define(PA_MICRO, [4])
 
 AC_INIT([pulseaudio], PA_MAJOR.PA_MINOR.PA_MICRO,[mzcbylcnhqvb (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/daemon/main.c])
@@ -33,14 +33,14 @@ AM_INIT_AUTOMAKE([foreign -Wall])
 AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR")
 AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/pulseaudio/])
 
-AC_SUBST(PA_API_VERSION, 9)
-AC_SUBST(PA_PROTOCOL_VERSION, 9)
+AC_SUBST(PA_API_VERSION, 10)
+AC_SUBST(PA_PROTOCOL_VERSION, 10)
 
-AC_SUBST(LIBPULSE_VERSION_INFO, [0:0:0])
-AC_SUBST(LIBPULSECORE_VERSION_INFO, [0:1:0])
+AC_SUBST(LIBPULSE_VERSION_INFO, [0:2:0])
+AC_SUBST(LIBPULSECORE_VERSION_INFO, [1:1:0])
 AC_SUBST(LIBPULSE_SIMPLE_VERSION_INFO, [0:0:0])
-AC_SUBST(LIBPULSE_BROWSE_VERSION_INFO, [0:0:0])
-AC_SUBST(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBPULSE_BROWSE_VERSION_INFO, [1:0:1])
+AC_SUBST(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO, [0:1:0])
 
 if type -p stow > /dev/null && test -d /usr/local/stow ; then
    AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
@@ -453,6 +453,37 @@ AC_SUBST(GLIB20_LIBS)
 AC_SUBST(HAVE_GLIB20)
 AM_CONDITIONAL([HAVE_GLIB20], [test "x$HAVE_GLIB20" = x1])
 
+#### GConf support (optional) ####
+
+AC_ARG_ENABLE([gconf], 
+    AC_HELP_STRING([--disable-gconf], [Disable optional GConf support]), 
+        [
+            case "${enableval}" in
+                yes) gconf=yes ;;
+                no) gconf=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --disable-gconf) ;;
+            esac
+        ],
+        [glib=auto])
+
+if test "x${gconf}" != xno ; then
+    PKG_CHECK_MODULES(GCONF, [ gconf-2.0 >= 2.4.0 ],
+        HAVE_GCONF=1,
+        [
+            HAVE_GCONF=0
+            if test "x$gconf" = xyes ; then
+                AC_MSG_ERROR([*** GConf support not found])
+            fi
+        ])
+else
+    HAVE_GCONF=0
+fi
+
+AC_SUBST(GCONF_CFLAGS)
+AC_SUBST(GCONF_LIBS)
+AC_SUBST(HAVE_GCONF)
+AM_CONDITIONAL([HAVE_GCONF], [test "x$HAVE_GCONF" = x1])
+
 #### Avahi support (optional) ####
 
 AC_ARG_ENABLE([avahi], 
@@ -606,6 +637,37 @@ AC_SUBST(LIRC_CFLAGS)
 AC_SUBST(LIRC_LIBS)
 AM_CONDITIONAL([HAVE_LIRC], [test "x$HAVE_LIRC" = x1])
 
+#### HAL support (optional) ####
+
+AC_ARG_ENABLE([hal], 
+    AC_HELP_STRING([--disable-hal], [Disable optional HAL support]), 
+        [
+            case "${enableval}" in
+                yes) hal=yes ;;
+                no) hal=no ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --disable-hal) ;;
+            esac
+        ],
+        [hal=auto])
+
+if test "x${hal}" != xno -a \( "x$HAVE_OSS" = "x1" -o "x$HAVE_ALSA" = "x1" \) ; then
+    PKG_CHECK_MODULES(HAL, [ hal >= 0.5.7 ],
+        HAVE_HAL=1,
+        [
+            HAVE_HAL=0
+            if test "x$hal" = xyes ; then
+                AC_MSG_ERROR([*** HAL support not found])
+            fi
+        ])
+else
+    HAVE_HAL=0
+fi
+
+AC_SUBST(HAL_CFLAGS)
+AC_SUBST(HAL_LIBS)
+AC_SUBST(HAVE_HAL)
+AM_CONDITIONAL([HAVE_HAL], [test "x$HAVE_HAL" = x1])
+
 #### PulseAudio system group & user  #####
 
 AC_ARG_WITH(system_user, AS_HELP_STRING([--with-system-user=<user>],[User for running the PulseAudio daemon as a system-wide instance (pulse)]))
@@ -724,6 +786,11 @@ if test "x$HAVE_GLIB20" = "x1" ; then
    ENABLE_GLIB20=yes
 fi
 
+ENABLE_GCONF=no
+if test "x$HAVE_GCONF" = "x1" ; then
+   ENABLE_GCONF=yes
+fi
+
 ENABLE_AVAHI=no
 if test "x$HAVE_AVAHI" = "x1" ; then
    ENABLE_AVAHI=yes
@@ -744,6 +811,11 @@ if test "x$HAVE_LIRC" = "x1" ; then
    ENABLE_LIRC=yes
 fi
 
+ENABLE_HAL=no
+if test "x$HAVE_HAL" = "x1" ; then
+   ENABLE_HAL=yes
+fi
+
 ENABLE_TCPWRAP=no
 if test "x${LIBWRAP_LIBS}" != x ; then
    ENABLE_TCPWRAP=yes
@@ -762,11 +834,13 @@ echo "
     Enable OSS:             ${ENABLE_OSS}
     Enable Alsa:            ${ENABLE_ALSA}
     Enable Solaris:         ${ENABLE_SOLARIS}
-    Enable Glib 2.0:        ${ENABLE_GLIB20}
+    Enable GLib 2.0:        ${ENABLE_GLIB20}
+    Enable GConf:           ${ENABLE_GCONF}
     Enable Avahi:           ${ENABLE_AVAHI}
     Enable Jack:            ${ENABLE_JACK}
     Enable Async DNS:       ${ENABLE_LIBASYNCNS}
     Enable LIRC:            ${ENABLE_LIRC}
+    Enable HAL:             ${ENABLE_HAL}
     Enable TCP Wrappers:    ${ENABLE_TCPWRAP}
     System User:            ${PA_SYSTEM_USER}
     System Group:           ${PA_SYSTEM_GROUP}