mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 06:16:36 +00:00
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
This commit is contained in:
parent
b7041d994b
commit
1b9be551d6
1 changed files with 20 additions and 20 deletions
40
configure.ac
40
configure.ac
|
@ -208,11 +208,26 @@ AC_MSG_RESULT(no)
|
||||||
dnl Check for essential libraries first:
|
dnl Check for essential libraries first:
|
||||||
dnl ====================================
|
dnl ====================================
|
||||||
|
|
||||||
dnl if test -n "`cat $GST_CFLAGS | grep USE_GLIB2`"; then
|
if test -n "`echo $GST_CFLAGS | grep USE_GLIB2`"; then
|
||||||
dnl HAVE_GLIB2=yes
|
USE_GLIB2=yes
|
||||||
dnl else
|
else
|
||||||
dnl HAVE_GLIB2=no
|
USE_GLIB2=no
|
||||||
dnl fi
|
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
|
dnl Check for X11 extensions
|
||||||
AC_PATH_XTRA
|
AC_PATH_XTRA
|
||||||
|
@ -254,21 +269,6 @@ AC_ARG_WITH(plugins,
|
||||||
|
|
||||||
AC_SUBST(GST_PLUGINS_SELECTED)
|
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 ==========================================================================
|
||||||
dnl ============================= sys plugins ================================
|
dnl ============================= sys plugins ================================
|
||||||
dnl ==========================================================================
|
dnl ==========================================================================
|
||||||
|
|
Loading…
Reference in a new issue