[Gnash-commit] gnash ChangeLog macros/gnashpkgtool.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/17 15:55:53

Modified files:
        .              : ChangeLog 
        macros         : gnashpkgtool.m4 

Log message:
                * macros/gnashpkgtool.m4: accept pkg-config finding for CFLAGS
                  (the bug was introduced by last commit of this file)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2126&r2=1.2127
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2126
retrieving revision 1.2127
diff -u -b -r1.2126 -r1.2127
--- ChangeLog   17 Jan 2007 14:39:31 -0000      1.2126
+++ ChangeLog   17 Jan 2007 15:55:53 -0000      1.2127
@@ -1,5 +1,7 @@
 2007-01-17 Sandro Santilli <address@hidden>
 
+       * macros/gnashpkgtool.m4: accept pkg-config finding for CFLAGS
+         (the bug was introduced by last commit of this file)
        * testsuite/actionscript.all/Makefile.am: don't distribute
          prebuilt test cases.
        * missing: fix stub for missing 'makeinfo'

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- macros/gnashpkgtool.m4      17 Jan 2007 11:08:14 -0000      1.34
+++ macros/gnashpkgtool.m4      17 Jan 2007 15:55:53 -0000      1.35
@@ -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.34 2007/01/17 11:08:14 strk Exp $
+dnl $Id: gnashpkgtool.m4,v 1.35 2007/01/17 15:55:53 strk Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -62,12 +62,17 @@
 
          if test x$cross_compiling = xno; then
          if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_incl}" = x; then
+           AC_MSG_CHECKING([for $2 header using pkg-config])
            $PKG_CONFIG --exists libDOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG 
--cflags libDOWN[]`
            $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_incl=`$PKG_CONFIG 
--cflags DOWN[]`
            $PKG_CONFIG --exists lib$name && ac_cv_path_$1_lib=`$PKG_CONFIG 
--cflags lib$name`
            $PKG_CONFIG --exists $name && ac_cv_path_$1_incl=`$PKG_CONFIG 
--cflags $name`
-           AC_MSG_CHECKING([for $2 header])
-           AC_MSG_RESULT(${ac_cv_path_$1_incl})
+           if test x"${ac_cv_path_$1_incl}" != x; then
+             AC_MSG_RESULT(${ac_cv_path_$1_incl} - pkg_config)
+             found_$1_incl="yes"
+           else
+             AC_MSG_RESULT(not found)
+           fi
           fi
        fi