changeset 4655:60910362ecf2

More simplifications of the configure code.

--- a/acinclude.m4	Mon Jun 16 14:15:36 2008 +0300
+++ b/acinclude.m4	Mon Jun 16 14:50:16 2008 +0300
@@ -50,7 +50,8 @@
 AC_DEFUN([AUD_ARG_ENABLE], [dnl
 # _A_ARG_ENABLE($1, $2, $3, $4, $5)
     define([Name], [translit([$1], [./-], [___])])dnl
-    AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$2],[yes],[--disable-$1],[--enable-$1])], [$3])],, [enable_[]Name=$2])
+    define([cBasce], [$3 (def: ifelse([$2],[yes],[enabled],[disabled]))])dnl
+    AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$2],[yes],[--disable-$1],[--enable-$1])], cBasce)],, [enable_[]Name=$2])
     if test "x${enable_[]Name}" = "xyes"; then
         m4_ifvaln([$4], [$4], [:])dnl
         m4_ifvaln([$5], [else $5])dnl
@@ -61,7 +62,8 @@
 AC_DEFUN([AUD_ARG_SIMPLE], [dnl
 # _A_ARG_SIMPLE($1, $2, $3, $4, $5, $6)
     define([Name], [translit([$1], [./-], [___])])dnl
-    AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$2],[yes],[--disable-$1],[--enable-$1])], [$3])],, [enable_[]Name=$2])
+    define([cBasce], [$3 (def: ifelse([$2],[yes],[enabled],[disabled]))])dnl
+    AC_ARG_ENABLE([$1], [AS_HELP_STRING([ifelse([$2],[yes],[--disable-$1],[--enable-$1])], cBasce)],, [enable_[]Name=$2])
     if test "x${enable_[]Name}" = "xyes"; then
         AC_DEFINE([$4], [$5], [$6])
     fi
@@ -190,7 +192,7 @@
 dnl SSE2 support
 dnl ============
 AUD_ARG_ENABLE([sse2], [yes],
-[Disable SSE2 support (def: enabled)],
+[Disable SSE2 support],
 [
     AC_MSG_CHECKING([SSE2 support])
     aud_my_save_CFLAGS="$CFLAGS"
@@ -217,7 +219,7 @@
 dnl AltiVec support 
 dnl ===============
 AUD_ARG_ENABLE([altivec], [yes],
-[Disable AltiVec support (def: enabled)],
+[Disable AltiVec support],
 [
     AC_CHECK_HEADERS([altivec.h],
     [

--- a/configure.ac	Mon Jun 16 14:15:36 2008 +0300
+++ b/configure.ac	Mon Jun 16 14:50:16 2008 +0300
@@ -76,7 +76,7 @@
 AC_PATH_PROG([AUDACIOUS_PATH], [audacious], [no])
 
 AUD_ARG_ENABLE([user-plugin-dir], [yes],
-[Disable per-user plugin dir (def: enabled)])
+[Disable per-user plugin dir])
 
 if test "x$enable_user_plugin_dir" = "xno"; then
     AC_DEFINE([DISABLE_USER_PLUGIN_DIR], 1, [Define to disable per user plugin directory])
@@ -87,7 +87,7 @@
 dnl Chardet support
 dnl ===============
 AUD_ARG_ENABLE([chardet], [yes],
-[Disable charset detection support (def: enabled)],
+[Disable charset detection support],
 [
     AC_DEFINE([USE_CHARDET], 1, [Define if character set detection enabled])
     AC_CHECK_LIB([udet_c], [detectCharset], [
@@ -103,7 +103,7 @@
 dnl D-Bus support
 dnl =============
 AUD_ARG_ENABLE([dbus], [yes],
-[Enable D-Bus support (def: enabled)],
+[Enable D-Bus support],
 [
     PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gthread-2.0],
         [enable_dbus=yes],
@@ -134,7 +134,7 @@
 dnl libsamplerate support
 dnl =====================
 AUD_ARG_ENABLE([samplerate], [no],
-[Enable libsamplerate support (def: disabled)],
+[Enable libsamplerate support],
 [
     AUD_CHECK_MODULE([SAMPLERATE], [samplerate],, [libsamplerate])
     aud_save_LIBS="$LIBS"
@@ -155,7 +155,7 @@
 dnl xspf playlist support
 dnl =====================
 AUD_ARG_ENABLE([xspf], [yes],
-[Disable XSPF support (def: enabled)],
+[Disable XSPF support],
 [
     AM_PATH_XML2([2.0.0],, [
        AC_MSG_WARN([*** libxml2 is not installed. XSPF playlist support will not be built. ***])
@@ -209,7 +209,7 @@
 AC_DEFINE_UNQUOTED([AUDACIOUS_DESKTOP_FILE], "${desktop_file}", [Location of the desktop file])
 
 AUD_ARG_ENABLE([sm], [yes],
-[Disable session management (def: enabled)],
+[Disable session management],
 [
     PKG_CHECK_MODULES([SM], [sm >= 1.0], [
         AC_DEFINE([USE_EGGSM], 1, [Define if session management should be used.])