reorganized xmms-related items

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@485 7f574dfc-610e-0410-a909-a81674777703

diff --git a/configure.in b/configure.in
index 8b0eac3..81bedf7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -43,6 +43,8 @@ AM_CONDITIONAL(BUILD_SOLARIS, test x$uname = xSunOS)
 AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD)
 AM_CONDITIONAL(BUILD_NETBSD, test x$uname = xNetBSD)
 
+PKG_PROG_PKG_CONFIG([0.17.2])
+
 dnl
 dnl XFT option
 dnl
@@ -79,22 +81,52 @@ if test $dah = "yes"; then
 fi
 
 dnl
-dnl Audacious
-dnl
-
-want_audacious=no
-AC_ARG_ENABLE(audacious,
-              [  --enable-audacious      enable if you want Audacious support [[default=no]]],
-              [want_audacious="$enableval"])
-
-AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes)
-if test x$want_audacious = xyes; then
-        PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 0.1],
-                          [], [AC_MSG_ERROR([Audacious 0.1 or higher is not installed])])
+dnl XMMS_SUPPORT
+dnl
+
+xmms_support=no
+AC_ARG_ENABLE(xmms-support,
+   [  --enable-xmms-support[[=project]] 
+        Specify the XMMS-related Project: 
+              none:      none [[default]]
+             xmms:      XMMS (version 1) Support
+             bmp:       Beep Media Player (not BMPx) Support 
+             audacious: Audacious (version >= 0.1) Media Player Support
+             infopipe:  XMMS/BMP InfoPipe (version 1.3) Plugin Support ],
+   [xmms_support="$enableval"])
+
+case x$xmms_support in
+    xnone)
+        ;;
+    xxmms)
+        AC_DEFINE(XMMS, 1, [Define for XMMS support])
+       echo "Sorry, xmms isn't supported yet"
+       exit -1
+       ;;
+    xbmp)
+       PKG_CHECK_MODULES([BMP], [bmp], [])
+       CFLAGS="$CFLAGS $BMP_CFLAGS"
+       LIBS="$LIBS $BMP_LIBS"
+       AC_DEFINE(BMP, 1, [Define for BMP support])
+       ;;
+    xaudacious)
+        PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 0.1])
         CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
-        LIBS="$LIBS $AUDACIOUS_LIBS"
-        AC_DEFINE(AUDACIOUS, 1, [Define if you want BMPx support])
-fi
+       LIBS="$LIBS $AUDACIOUS_LIBS"
+        AC_DEFINE(AUDACIOUS, 1, [Define for Audacious support])
+        ;;
+    xinfopipe)
+        AC_DEFINE(INFOPIPE, 1, [Define for XMMS/BMP InfoPipe support])
+       ;;
+    *)
+        echo "Error: invalid xmms-status specified: $xmms_support"
+       exit -1
+       ;;
+esac
+AM_CONDITIONAL(BUILD_XMMS, test x$xmms_support = xxmms)
+AM_CONDITIONAL(BUILD_BMP, test x$xmms_support = xbmp)
+AM_CONDITIONAL(BUILD_AUDACIOUS, test x$xmms_support = xaudacious)
+AM_CONDITIONAL(BUILD_INFOPIPE, test x$xmms_support = xinfopipe)
 
 dnl
 dnl BMPx
@@ -146,20 +178,6 @@ if test x$want_mpd = xyes; then
 fi
 
 dnl
-dnl INFOPIPE
-dnl
-
-want_infopipe=yes
-AC_ARG_ENABLE(infopipe,
-[  --enable-infopipe       enable if you want XMMS/BMP InfoPipe support [[default=yes]]],
-  [want_infopipe="$enableval"])
-
-AM_CONDITIONAL(BUILD_INFOPIPE, test x$want_infopipe = xyes)
-if test x$want_infopipe = xyes; then
-  AC_DEFINE(INFOPIPE, 1, [Define if you want XMMS/BMP InfoPipe support])
-fi
-
-dnl
 dnl PORT_MONITORS
 dnl