[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok
From:       Max Howell <max.howell () methylblue ! com>
Date:       2005-04-23 15:10:19
Message-ID: 20050423151019.74CDE492 () office ! kde ! org
[Download RAW message or body]

CVS commit by mhowell: 

Allow conditional configuring for libvisual + xmmswrapper. Seems to work. If it does \
I'll backport it.

CCMAIL:damir.perisa@solnet.ch


  M +53 -37    configure.in.in   1.98


--- kdeextragear-1/amarok/configure.in.in  #1.97:1.98
@@ -473,30 +473,38 @@
 ###############################################################################
 
-AC_CHECK_PROG(XMMS_CONFIG, xmms-config, yes)
+AC_ARG_WITH(xmms,
+    AC_HELP_STRING([--without-xmms],[build amaroK without xmms visualization \
support]), +    [with_xmms=$withval],
+    [with_xmms=yes]
+)
 
-if test x$XMMS_CONFIG = xyes; then
-    xmms_plugin_path=`xmms-config --visualization-plugin-dir`
-    xmms_cflags=`xmms-config --cflags`
-    xmms_libs=`xmms-config --libs`
-fi
+if test "$with_xmms" = "yes"; then
+    AC_CHECK_PROG(XMMS_CONFIG, xmms-config, yes)
 
-AC_DEFINE_UNQUOTED(XMMS_PLUGIN_PATH, "$xmms_plugin_path", [Define the path to XMMS \
                plugins])
-AC_SUBST(xmms_cflags)
-AC_SUBST(xmms_libs)
-
-## XMMSwrapper depends on gtk/gdk headers
-AC_CHECK_PROG(GTK_CONFIG, gtk-config, yes)
-
-if test x$XMMS_CONFIG = xyes -a x$GTK_CONFIG = xyes; then
-    gtk_cflags=`gtk-config --cflags`
-    gtk_libs=`gtk-config --libs`
-    build_xmmswrapper=yes
-    AC_DEFINE(HAVE_XMMS, 1, [have XMMS])
-else
-    build_xmmswrapper=no
-fi
+    if test x$XMMS_CONFIG = xyes; then
+        xmms_plugin_path=`xmms-config --visualization-plugin-dir`
+        xmms_cflags=`xmms-config --cflags`
+        xmms_libs=`xmms-config --libs`
+    fi
+
+    AC_DEFINE_UNQUOTED(XMMS_PLUGIN_PATH, "$xmms_plugin_path", [Define the path to \
XMMS plugins]) +    AC_SUBST(xmms_cflags)
+    AC_SUBST(xmms_libs)
+
+    ## XMMSwrapper depends on gtk/gdk headers
+    AC_CHECK_PROG(GTK_CONFIG, gtk-config, yes)
+
+    if test x$XMMS_CONFIG = xyes -a x$GTK_CONFIG = xyes; then
+        gtk_cflags=`gtk-config --cflags`
+        gtk_libs=`gtk-config --libs`
+        build_xmmswrapper=yes
+        AC_DEFINE(HAVE_XMMS, 1, [have XMMS])
+    else
+        build_xmmswrapper=no
+    fi
 
-AC_SUBST(gtk_cflags)
-AC_SUBST(gtk_libs)
+    AC_SUBST(gtk_cflags)
+    AC_SUBST(gtk_libs)
+fi
 
 AM_CONDITIONAL(with_xmmswrapper, test x$build_xmmswrapper = xyes )
@@ -512,24 +520,32 @@
 ###############################################################################
 
-## libvisual plugin depends on sdl
-AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes)
+AC_ARG_WITH(libvisual,
+    AC_HELP_STRING([--without-libvisual],[build amaroK without libvisual support]),
+    [with_libvisual=$withval],
+    [with_libvisual=yes]
+)
 
-if test x$SDL_CONFIG = xyes; then
-    sdl_cflags=`sdl-config --cflags`
-    sdl_libs=`sdl-config --libs`
-fi
+if test "$with_libvisual" = "yes"; then
+    ## libvisual plugin depends on sdl
+    AC_CHECK_PROG(SDL_CONFIG, sdl-config, yes)
+
+    if test x$SDL_CONFIG = xyes; then
+        sdl_cflags=`sdl-config --cflags`
+        sdl_libs=`sdl-config --libs`
+    fi
 
-AC_SUBST(sdl_cflags)
-AC_SUBST(sdl_libs)
+    AC_SUBST(sdl_cflags)
+    AC_SUBST(sdl_libs)
 
-if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
+    if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
 
-    PKG_CHECK_MODULES(LIBVISUAL, libvisual >= 0.2.0, [build_libvisual="yes"], \
[build_libvisual="no"]) +        PKG_CHECK_MODULES(LIBVISUAL, libvisual >= 0.2.0, \
[build_libvisual="yes"], [build_libvisual="no"])  
-    AC_SUBST(LIBVISUAL_LIBS)
-    AC_SUBST(LIBVISUAL_CFLAGS)
+        AC_SUBST(LIBVISUAL_LIBS)
+        AC_SUBST(LIBVISUAL_CFLAGS)
 
-    if test x$build_libvisual = xyes; then
-        AC_DEFINE(HAVE_LIBVISUAL, 1, [have LIBVISUAL])
+        if test x$build_libvisual = xyes; then
+            AC_DEFINE(HAVE_LIBVISUAL, 1, [have LIBVISUAL])
+        fi
     fi
 fi


[prev in list] [next in list] [prev in thread] [next in thread]