[Gnash-commit] gnash ChangeLog configure.ac macros/gstreamer.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/25 22:46:36

Modified files:
        .              : ChangeLog configure.ac 
        macros         : gstreamer.m4 

Log message:
                * configure.ac: move XML2 and GLIB macro calls before gstreamer
                  one, so we can use LIBXML_CFLAGS and GLIB_CFLAGS when checking
                  for gstreamer headers.
                * macros/gstreamer.m4: always run AC_CHECK_HEADERS for gstreamer
                  so to get HAVE_GST_GST_H defined; fixed AC_CHECK_LIB call to
                  use an actually available function in libgstreamer-0.10.so

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.519&r2=1.520
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -b -r1.519 -r1.520
--- ChangeLog   25 Jul 2006 21:14:03 -0000      1.519
+++ ChangeLog   25 Jul 2006 22:46:36 -0000      1.520
@@ -1,5 +1,11 @@
 2006-07-25 Sandro Santilli <address@hidden>
 
+       * configure.ac: move XML2 and GLIB macro calls before gstreamer
+         one, so we can use LIBXML_CFLAGS and GLIB_CFLAGS when checking
+         for gstreamer headers.
+       * macros/gstreamer.m4: always run AC_CHECK_HEADERS for gstreamer
+         so to get HAVE_GST_GST_H defined; fixed AC_CHECK_LIB call to
+         use an actually available function in libgstreamer-0.10.so
        * macros/gstreamer.m4: --with-gstreamer => --with-gst,
          look for libgstreamer-0.10.so rather then for libgstplaybin.so,
          fixed handling of --with-gst-libs (was using value given to

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- configure.ac        25 Jul 2006 19:27:54 -0000      1.89
+++ configure.ac        25 Jul 2006 22:46:36 -0000      1.90
@@ -83,9 +83,6 @@
   *)   AC_MSG_ERROR([bad value ${enableval} for disable-xml option]) ;;
 esac],xml=yes)
 
-if test x$xml != xno; then
-    AM_PATH_LIBXML2
-fi
 AM_CONDITIONAL(XML, test x$xml = xyes)
 
 dnl Fix the Intel 810 LOD bias problem
@@ -334,7 +331,16 @@
 GNASH_PATH_SDL
 AM_CONDITIONAL(HAS_SDL, [ test x$has_sdl = xyes ])
 GNASH_PATH_SDL_MIXER
+
+dnl
+dnl NOTE: make sure to check for GLIB and LIBXML2 
+dnl before checking for gstreamer
+dnl
+
+GNASH_PATH_GLIB
+AM_PATH_LIBXML2 
 GNASH_PATH_GSTREAMER
+
 GNASH_PATH_OPENGL
 GNASH_PATH_GLEXT
 GNASH_PATH_GTK2
@@ -344,7 +350,6 @@
 GNASH_PATH_XFT
 AM_CONDITIONAL(HAS_XFT, [ test x$has_xft = xyes ])
 GNASH_PATH_CAIRO
-GNASH_PATH_GLIB
 GNASH_PATH_PANGO
 GNASH_PATH_ATK
 GNASH_PATH_PTHREADS

Index: macros/gstreamer.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gstreamer.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/gstreamer.m4 25 Jul 2006 21:14:03 -0000      1.12
+++ macros/gstreamer.m4 25 Jul 2006 22:46:36 -0000      1.13
@@ -42,7 +42,7 @@
     AC_CACHE_VAL(ac_cv_path_gstreamer_incl,[
     if test x"${with_gstreamer_incl}" != x ; then
       if test -f ${with_gstreamer_incl}/gst/gst.h ; then
-       ac_cv_path_gstreamer_incl=`(cd ${with_gstreamer_incl}; pwd)`
+       ac_cv_path_gstreamer_incl=-I`(cd ${with_gstreamer_incl}; pwd)`
       else
        AC_MSG_ERROR([${with_gstreamer_incl} directory doesn't contain 
gstreamer/gstreamergl.h])
       fi
@@ -53,6 +53,7 @@
     dnl doesn't seem to get a directory that is unversioned.
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gstreamer_incl}" = x; then
       ac_cv_path_gstreamer_incl=`$PKG_CONFIG --cflags gstreamer-0.10`
+      dnl The following is actually unchecked
     fi
 
     if test x"${ac_cv_path_gstreamer_incl}" = x; then
@@ -159,6 +160,25 @@
     GSTREAMER_CFLAGS=""
   fi
 
+  dnl
+  dnl Call AC_CHECK_HEADERS again here to
+  dnl get HAVE_* macros automatically defined
+  dnl
+  dnl NOTE: we need additional headers for things to work
+  dnl
+
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $GSTREAMER_CFLAGS $GLIB_CFLAGS $LIBXML_CFLAGS"
+  echo "CFLAGS==$CFLAGS"
+  AC_CHECK_HEADERS(gst/gst.h, [], [],
+[
+#if HAVE_GLIB_H
+# include <glib.h>
+# endif
+#include <libxml/parser.h>
+])
+  CFLAGS="$ac_save_CFLAGS"
+
   if test x"${ac_cv_path_gstreamer_lib}" != x ; then
     GSTREAMER_LIBS="${ac_cv_path_gstreamer_lib}"
 dnl    AC_MSG_WARN([You need GStreamer 0.10 or greater for sound support!])