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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/07/25 03:13:17

Modified files:
        macros         : gstreamer.m4 
        .              : configure.ac Makefile.am ChangeLog 
Added files:
        macros         : pkg.m4 

Log message:
                * Makefile.am: Print the Gstreamer paths for dumpconfig.
                * macros/pkg.m4: Add macros to find pkg-config. 
                * macros/gstreamer.m4: If pkg-config exists, use it, otherwise
                look for the correct header file and libraries.
                * configure.ac: Look for pkg-config.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gstreamer.m4?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pkg.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.508&r2=1.509

Patches:

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- configure.ac        22 Jul 2006 23:47:55 -0000      1.87
+++ configure.ac        25 Jul 2006 03:13:17 -0000      1.88
@@ -255,7 +255,7 @@
 AM_COMPILER_LIB
 GNASH_PATH_DMALLOC
 AC_CHECK_FUNCS(mallinfo)
-
+PKG_PROG_PKG_CONFIG
 dnl LIBS+="-L/usr/lib64"
 
 dnl
@@ -783,9 +783,9 @@
  libsdl-mixer1.2-dev (using apt-get) or SDL_mixer-devel (using yum)."
 fi
 
-dnl As the GStreamer support isn;t used, but is to support a
+dnl As the GStreamer support isn't used, but is to support a
 dnl work-in-progress, we don't want to confuse people by printing a
-dnl warnign if it's not installed.
+dnl warning if it's not installed.
 if test x"$GSTREAMER_LIBS" != x; then
     echo "        Gstreamer flags are: $GSTREAMER_CFLAGS"
     echo "        Gstreamer libs are: $GSTREAMER_LIBS"

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Makefile.am 14 Jul 2006 00:07:41 -0000      1.29
+++ Makefile.am 25 Jul 2006 03:13:17 -0000      1.30
@@ -129,6 +129,8 @@
        @echo "PTHREAD_LIBS is $(PTHREAD_LIBS)"
        @echo "CURL_CFLAGS is $(CURL_CFLAGS)"
        @echo "CURL_LIBS is $(CURL_LIBS)"
+       @echo "GSTREAMER_CFLAGS is $(GSTREAMER_CFLAGS)"
+       @echo "GSTREAMER_LIBS is $(GSTREAMER_LIBS)"
        @echo "A blank value for CFLAGS means the header is installed in the"
        @echo "default system header location. All the LIBS should have a"
        @echo "legit value"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -b -r1.508 -r1.509
--- ChangeLog   24 Jul 2006 23:31:05 -0000      1.508
+++ ChangeLog   25 Jul 2006 03:13:17 -0000      1.509
@@ -1,3 +1,11 @@
+2006-07-25 Rob Savoye <address@hidden>
+
+       * Makefile.am: Print the Gstreamer paths for dumpconfig.
+       * macros/pkg.m4: Add macros to find pkg-config. 
+       * macros/gstreamer.m4: If pkg-config exists, use it, otherwise
+       look for the correct header file and libraries.
+       * configure.ac: Look for pkg-config.
+
 2006-07-24 Sandro Santilli <address@hidden>
 
        * macros/gstreamer.m4: report result of headers checking