[Goodies-commits] r2651 - in xfce4-mpc-plugin/trunk: . panel-plugin

Landry Breuil landry at xfce.org
Mon Apr 2 19:39:22 CEST 2007


Author: landry
Date: 2007-04-02 17:39:22 +0000 (Mon, 02 Apr 2007)
New Revision: 2651

Modified:
   xfce4-mpc-plugin/trunk/configure.ac
   xfce4-mpc-plugin/trunk/panel-plugin/Makefile.am
Log:
- Rework libmpd detection and link/flags - should work with auto* 2.61 now
- correct nick's missing LD* change


Modified: xfce4-mpc-plugin/trunk/configure.ac
===================================================================
--- xfce4-mpc-plugin/trunk/configure.ac	2007-04-02 16:57:03 UTC (rev 2650)
+++ xfce4-mpc-plugin/trunk/configure.ac	2007-04-02 17:39:22 UTC (rev 2651)
@@ -9,7 +9,7 @@
 	[landry at fr.homeunix.org])
 
 MPC_VERSION=mpc_version()
-AM_INIT_AUTOMAKE([xfce4-mpc-plugin], [$MPC_VERSION])
+AM_INIT_AUTOMAKE([xfce4-mpc-plugin], [$MPC_VERSION], [-Wall -Werror foreign])
 AM_CONFIG_HEADER([config.h])
 
 AM_MAINTAINER_MODE
@@ -31,11 +31,14 @@
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22])
 
 dnl check for libmpd presence
-AM_CONDITIONAL(HAVE_LIBMPD, false)
 AC_ARG_WITH(libmpd,
     AC_HELP_STRING([--with-libmpd=path], [path to libmpd base directory]),
         LIBMPD_PATH="$withval", LIBMPD_PATH="")
 
+use_libmpd=false
+AM_CONDITIONAL([HAVE_LIBMPD], [test "$use_libmpd" = true])
+AC_DEFINE([HAVE_LIBMPD], [0], [no libmpd found])
+
 AC_MSG_CHECKING([whether --with-libmpd was used])
 if test x"$LIBMPD_PATH" != x"" ; then
    if test x"$LIBMPD_PATH" = x"no" ; then
@@ -45,7 +48,8 @@
       AC_MSG_RESULT([yes, using $LIBMPD_PATH])
       LIBMPD_CFLAGS="-I${LIBMPD_PATH}/include/"
       LIBMPD_LIBS="-L${LIBMPD_PATH}/lib/ -lmpd"
-      AC_DEFINE(HAVE_LIBMPD, 1)
+      AC_DEFINE([HAVE_LIBMPD], [1], [libmpd found])
+      use_libmpd=true
       AC_SUBST([LIBMPD_CFLAGS])
       AC_SUBST([LIBMPD_LIBS])
    fi
@@ -53,13 +57,14 @@
    AC_MSG_RESULT([no, falling back to pkg-config])
    XDT_CHECK_OPTIONAL_PACKAGE([LIBMPD], [libmpd], [0.12], [libmpd], [libmpd])
    if test x"$LIBMPD_FOUND" = x"yes"; then
-      AC_DEFINE(HAVE_LIBMPD, 1)
+      AC_DEFINE([HAVE_LIBMPD], [1], [libmpd found])
+      use_libmpd=true
       echo "* Build with libmpd: yes"
    else
       echo "* Build with libmpd: no, falling back to our implementation"
    fi
 fi
-
+AM_CONDITIONAL(USE_LIBMPD, [test "$use_libmpd" = true])
 dnl Translations
 XDT_I18N([cs fr pl])
 

Modified: xfce4-mpc-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-mpc-plugin/trunk/panel-plugin/Makefile.am	2007-04-02 16:57:03 UTC (rev 2650)
+++ xfce4-mpc-plugin/trunk/panel-plugin/Makefile.am	2007-04-02 17:39:22 UTC (rev 2651)
@@ -10,9 +10,9 @@
 
 
 xfce4_mpc_plugin_SOURCES = xfce4-mpc-plugin.c xfce4-mpc-plugin.h
-if HAVE_LIBMPD
+if USE_LIBMPD
 xfce4_mpc_plugin_CFLAGS += @LIBMPD_CFLAGS@
-xfce4_mpc_plugin_LDFLAGS += @LIBMPD_LIBS@
+xfce4_mpc_plugin_LDADD += @LIBMPD_LIBS@
 else
 xfce4_mpc_plugin_SOURCES += simple-libmpd.c simple-libmpd.h
 endif




More information about the Goodies-commits mailing list