[Gnash-commit] gnash/macros jpeg.m4 png.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/13 01:07:36

Modified files:
        macros         : jpeg.m4 png.m4 

Log message:
        Minor bug-fixes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/png.m4?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- jpeg.m4     13 Oct 2006 00:56:54 -0000      1.14
+++ jpeg.m4     13 Oct 2006 01:07:36 -0000      1.15
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: jpeg.m4,v 1.14 2006/10/13 00:56:54 nihilus Exp $
+dnl $Id: jpeg.m4,v 1.15 2006/10/13 01:07:36 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_JPEG],
 [
@@ -52,7 +52,7 @@
     AC_CACHE_VAL(ac_cv_path_jpeg_incl,[
     if test x"${with_jpeg_incl}" != x ; then
       if test -f ${with_jpeg_incl}/jpeglib.h ; then
-       ac_cv_path_jpeg_incl=`(cd ${with_jpeg_incl}; pwd)`
+       ac_cv_path_jpeg_incl=-I`(cd ${with_jpeg_incl}; pwd)`
       else
        AC_MSG_ERROR([${with_jpeg_incl} directory doesn't contain jpeglib.h])
     fi

Index: png.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/png.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- png.m4      13 Oct 2006 00:36:43 -0000      1.14
+++ png.m4      13 Oct 2006 01:07:36 -0000      1.15
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: png.m4,v 1.14 2006/10/13 00:36:43 nihilus Exp $
+dnl $Id: png.m4,v 1.15 2006/10/13 01:07:36 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_PNG],
 [
@@ -50,16 +50,12 @@
     dnl Look for the header
   AC_ARG_WITH(png_incl, [  --with-png-incl         directory where libpng 
header is], with_png_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_png_incl, [
-    AC_MSG_CHECKING([for png.h header in specified directory])
     if test x"${with_png_incl}" != x ; then
       if test -f ${with_png_incl}/png.h ; then
-       ac_cv_path_png_incl=`(cd ${with_png_incl}; pwd)`
-       AC_MSG_RESULT([yes])
+       ac_cv_path_png_incl=-I`(cd ${with_png_incl}; pwd)`
       else
        AC_MSG_ERROR([${with_png_incl} directory doesn't contain png.h])
       fi
-    else
-       AC_MSG_RESULT([no])
     fi
     ])