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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/26 10:31:30

Modified files:
        .              : configure.ac 
        macros         : gnashpkgtool.m4 

Log message:
        Updated for gstreamer

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.214&r2=1.215
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- configure.ac        26 Nov 2006 00:07:10 -0000      1.214
+++ configure.ac        26 Nov 2006 10:31:30 -0000      1.215
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.214 2006/11/26 00:07:10 nihilus Exp $
+dnl $Id: configure.ac,v 1.215 2006/11/26 10:31:30 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -654,7 +654,7 @@
 
 
 if test "$sound_handler" = "gst"; then
-       GNASH_PKG_FIND(gstreamer, [gst.h], [gstreamer library], gst_init, 
[0.10])
+       GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, 
[0.10])
 fi
 
 dnl I'm kinda lazy, get rid of this later... //Markus

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/gnashpkgtool.m4      26 Nov 2006 10:29:35 -0000      1.29
+++ macros/gnashpkgtool.m4      26 Nov 2006 10:31:30 -0000      1.30
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: gnashpkgtool.m4,v 1.29 2006/11/26 10:29:35 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.30 2006/11/26 10:31:30 nihilus Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -65,7 +65,7 @@
 
        dnl If the path hasn't been specified, go look for it.
        if test x"${ac_cv_path_$1_incl}" = x; then
-               AC_CHECK_HEADERS($1/$2 $2 $name/$2, [ac_cv_path_$1_incl="-I$1 
-I$name"],[
+               AC_CHECK_HEADERS($1/$2 $2 $name/$2, 
[ac_cv_path_$1_incl="-I$1"],[
                if test x"${ac_cv_path_$1_incl}" = x; then
                incllist="${prefix}/${target_alias}/include ${prefix}/include 
/sw/include /usr/nekoware/include /usr/freeware/include /pkg/include 
/opt/local/include /usr/local/include /home/latest/include /opt/include 
/opt/mesa/include /opt/include /usr/X11R6/include /usr/include /usr/pkg/include 
.. ../.."
                for i in $incllist; do