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

List:       kde-commits
Subject:    branches/KDE/3.5/kdemultimedia
From:       Diego Pettenò <dgp85 () users ! sourceforge ! net>
Date:       2006-03-30 0:55:28
Message-ID: 1143680128.541555.5770.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 524224 by dgp:

Move the arts check to top level configure.in.in as it's used by other subdirectories other than juk.

 M  +18 -0     configure.in.in  
 M  +0 -18     juk/configure.in.in  


--- branches/KDE/3.5/kdemultimedia/configure.in.in #524223:524224
@@ -548,4 +548,22 @@
   fi
 fi
 
+artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+AC_PATH_PROG(ARTSCCONFIG, artsc-config, no, $artsc_config_test_path)
+
+if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
+	LIB_ARTS="-lartskde"
+	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
+	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
+else
+	build_arts="no"
+	LIB_ARTS=""
+	ARTS_CFLAGS=""
+	AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk])
+fi
+
+AC_SUBST(LIB_ARTS)
+AC_SUBST(ARTS_CFLAGS)
+
 KDE_CHECK_MPEGLIB_ARTS
--- branches/KDE/3.5/kdemultimedia/juk/configure.in.in #524223:524224
@@ -2,24 +2,6 @@
 
 AM_INIT_AUTOMAKE(juk,1.0)
 
-artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
-AC_PATH_PROG(ARTSCCONFIG, artsc-config, no, $artsc_config_test_path)
-
-if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
-	LIB_ARTS="-lartskde"
-	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
-	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
-	AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
-else
-	build_arts="no"
-	LIB_ARTS=""
-	ARTS_CFLAGS=""
-	AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk])
-fi
-
-AC_SUBST(LIB_ARTS)
-AC_SUBST(ARTS_CFLAGS)
-
 AC_ARG_WITH(musicbrainz,
   	[AC_HELP_STRING(--with-musicbrainz,
 	[enable support for MusicBrainz @<:@default=check@:>@])],
[prev in list] [next in list] [prev in thread] [next in thread]