Test for a working libglade-gnome, and compile gstplay only if there is one.

Original commit message from CVS:
Test for a working libglade-gnome, and compile gstplay only if there is
one.
This commit is contained in:
Richard Boulton 2000-08-18 23:31:30 +00:00
parent 3632d35862
commit 9ae673e291
2 changed files with 40 additions and 9 deletions

View file

@ -1,4 +1,17 @@
SUBDIRS = gst libs plugins gstplay test editor tools docs tests
if HAVE_LIBGLADE_GNOME
# The following line mustn't be indented - automake is _very_ fussy..
gstplay_subdir=gstplay
else
# The following line mustn't be indented - automake is _very_ fussy..
gstplay_subdir=
endif
# These are the subdirs which might get used.
SUBDIRS = gst libs plugins . $(gstplay_subdir) test editor tools docs tests
# These are all the possible subdirs
DIST_SUBDIRS = gst libs plugins . gstplay test editor tools docs tests
bin_SCRIPTS = gstreamer-config bin_SCRIPTS = gstreamer-config

View file

@ -115,6 +115,23 @@ AC_CHECK_LIB(ghttp, ghttp_request_new,
AC_SUBST(GHTTP_LIBS) AC_SUBST(GHTTP_LIBS)
AC_SUBST(GST_HTTPSRC_GET_TYPE) AC_SUBST(GST_HTTPSRC_GET_TYPE)
dnl Check for libglade
HAVE_LIBGLADE_GNOME="no"
AC_PATH_PROG(LIBGLADE_CONFIG_PATH, libglade-config, no)
if test x$LIBGLADE_CONFIG_PATH = xno; then
AC_MSG_WARN(Couldn't find libglade-config - Can't build gstplay)
else
libglade_save_CFLAGS=${CFLAGS}
CFLAGS="$CFLAGS `$LIBGLADE_CONFIG_PATH --libs gnome` `$LIBGLADE_CONFIG_PATH --cflags gnome`"
AC_TRY_LINK([#include <glade/glade.h>],[glade_gnome_init();],
HAVE_LIBGLADE_GNOME="yes",
AC_MSG_WARN(
[Couldn't find gnome libraries for libglade - Can't build gstplay])
)
CFLAGS=${libglade_save_CFLAGS}
AC_MSG_WARN()
fi
dnl Check for atomic.h dnl Check for atomic.h
dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter dnl Note: use AC_CHECK_HEADER not AC_CHECK_HEADERS, because the latter
dnl defines the wrong default symbol as well (HAVE_ASM_ATOMIC_H) dnl defines the wrong default symbol as well (HAVE_ASM_ATOMIC_H)
@ -321,6 +338,7 @@ AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes")
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes") AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes") AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes")
AM_CONDITIONAL(HAVE_NASM, test "x$HAVE_NASM" = "xyes") AM_CONDITIONAL(HAVE_NASM, test "x$HAVE_NASM" = "xyes")
AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes")
AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC) AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC)