From: <bi...@ke...> - 2006-05-10 14:49:10
|
CVS Root: /cvs/gstreamer Module: gnonlin Changes by: bilboed Date: Wed May 10 2006 14:49:02 UTC Log message: Reverting cruft that went in previous commit to configure.ac Modified files: . : configure.ac Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gnonlin/configure.ac.diff?r1=1.49&r2=1.50 ====Begin Diffs==== Index: configure.ac =================================================================== RCS file: /cvs/gstreamer/gnonlin/configure.ac,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- configure.ac 10 May 2006 14:44:10 -0000 1.49 +++ configure.ac 10 May 2006 14:48:50 -0000 1.50 @@ -119,28 +119,6 @@ AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no) AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") -dnl GTK is optional and used in examples -HAVE_GTK=NO -PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no) -if test "x$HAVE_GTK_22" = "xyes"; then - HAVE_GTK=yes - GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` - AC_SUBST(GTK_VERSION) - GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0` - AC_SUBST(GTK_BASE_DIR) -else - PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no) -fi -if test "x$HAVE_GTK_20" = "xyes"; then -GTK_CFLAGS=$GTK2_CFLAGS -GTK_LIBS=$GTK2_LIBS -AC_SUBST(GTK_LIBS) -AC_SUBST(GTK_CFLAGS) -AC_SUBST(HAVE_GTK) -AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") - dnl *** set variables based on configure arguments *** dnl set license and copyright notice @@ -206,8 +184,6 @@ m4/Makefile tests/Makefile tests/check/Makefile -tests/examples/Makefile -tests/examples/seek/Makefile gnl/Makefile gnl/gnlversion.h gnonlin.spec |