diff options
| author | Andy Wingo <wingo@pobox.com> | 2002-01-05 00:56:40 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2002-01-05 00:56:40 +0000 |
| commit | 0c768a5091021be24f2ca1abea2ab2b50704e5b6 (patch) | |
| tree | dda6dfe4786645e20aa82d7184ecb9102ae5433e | |
| parent | 534a1e490f83eb706e0fddd36b7e0d393e36baa2 (diff) | |
| download | gst-plugins-bad-0c768a5091021be24f2ca1abea2ab2b50704e5b6.tar.gz gst-plugins-bad-0c768a5091021be24f2ca1abea2ab2b50704e5b6.tar.bz2 gst-plugins-bad-0c768a5091021be24f2ca1abea2ab2b50704e5b6.zip | |
changes to allow apps outside of gstreamer/ to use dparams continuing test removal
Original commit message from CVS:
* changes to allow apps outside of gstreamer/ to use dparams
* continuing test removal
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index b4ca8d20..29e0aeeb 100644 --- a/configure.ac +++ b/configure.ac @@ -208,11 +208,26 @@ AC_MSG_RESULT(no) dnl Check for essential libraries first: dnl ==================================== -dnl if test -n "`cat $GST_CFLAGS | grep USE_GLIB2`"; then -dnl HAVE_GLIB2=yes -dnl else -dnl HAVE_GLIB2=no -dnl fi +if test -n "`echo $GST_CFLAGS | grep USE_GLIB2`"; then + USE_GLIB2=yes +else + USE_GLIB2=no +fi + +dnl needed for some plugins and demos, now's a nice time to check for gtk +if test x$USE_GLIB2 = xno; then + AM_PATH_GTK(1.2.0,, + AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?)) + HAVE_GTK=yes + # we have to have it +else + PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no) + + GTK_CFLAGS=$GTK2_CFLAGS + GTK_LIBS=$GTK2_LIBS +fi +AC_SUBST(GTK_LIBS) +AC_SUBST(GTK_CFLAGS) dnl Check for X11 extensions AC_PATH_XTRA @@ -254,21 +269,6 @@ AC_ARG_WITH(plugins, AC_SUBST(GST_PLUGINS_SELECTED) -dnl needed for smoothwave, FIXME! -if test x$USE_GLIB2 = xno; then - AM_PATH_GTK(1.2.0,, - AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?)) - HAVE_GTK=yes - # we have to have it -else - PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no) - - GTK_CFLAGS=$GTK2_CFLAGS - GTK_LIBS=$GTK2_LIBS -fi -AC_SUBST(GTK_LIBS) -AC_SUBST(GTK_CFLAGS) - dnl ========================================================================== dnl ============================= sys plugins ================================ dnl ========================================================================== |