libgnome/configure.in: esound, audiofile, pkgconfig



this patch makes the esound and audiofile detection use pkgconfig.

esound 0.2.23 included a .pc file, and cvs audiofile does.  fortunately
it won't die if you don't have them installed.

objections?

jacob
-- 
"Beat mixing is 10000 times more fun than even video games."
	-- bt
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libgnome/configure.in,v
retrieving revision 1.72
diff -u -r1.72 configure.in
--- configure.in	2001/10/18 14:53:23	1.72
+++ configure.in	2001/10/23 21:59:17
@@ -30,12 +30,14 @@
 dnl
 dnl Check for esound library
 dnl
-AM_PATH_ESD(0.2.5, AC_DEFINE(HAVE_ESD))
+ESOUND_VERSION=0.2.23
+PKG_CHECK_MODULES(ESD_FAKE, esound >= $ESOUND_VERSION, AC_DEFINE(HAVE_ESD))
 
 dnl
 dnl Check for audiofile library
 dnl
-AM_PATH_AUDIOFILE(0.1.5,AC_DEFINE(HAVE_LIBAUDIOFILE))
+AUDIOFILE_VERSION=0.2.2
+PKG_CHECK_MODULES(AF_FAKE, audiofile >= $AUDIOFILE_VERSION, AC_DEFINE(HAVE_LIBAUDIOFILE))
 
 ALL_LINGUAS="az es fr it nn no ru sk sv ta tr wa zh_TW"
 AM_GNOME2_GETTEXT
@@ -73,13 +75,8 @@
 dnl Start of pkg-config checks
 dnl
 PKG_CHECK_MODULES(LIBGNOME, glib-2.0 >= 1.3.7 gmodule-2.0 >= 1.3.7 gnome-vfs-2.0 >= 1.1 \
-	          libxml-2.0 >= 2.4.1 libbonobo-2.0 >= 1.100.0 gconf-2.0 >= 1.1.1)
-
-dnl
-dnl Add esd and audiofile stuff
-dnl
-LIBGNOME_CFLAGS="$LIBGNOME_CFLAGS $AUDIOFILE_CFLAGS $ESD_CFLAGS"
-LIBGNOME_LIBS="$LIBGNOME_LIBS $AUDIOFILE_LIBS $ESD_LIBS"
+	          libxml-2.0 >= 2.4.1 libbonobo-2.0 >= 1.100.0 gconf-2.0 >= 1.1.1 \
+		  audiofile >= $AUDIOFILE_VERSION esound >= $ESOUND_VERSION)
 
 dnl
 dnl Check for gtk-doc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]