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

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/30 18:23:20

Modified files:
        .              : ChangeLog 
        macros         : gnashpkgtool.m4 

Log message:
        Add support for pkgname-config scripts that don't understand
        --cxxflags, such as nspr-config.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6094&r2=1.6095
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6094
retrieving revision 1.6095
diff -u -b -r1.6094 -r1.6095
--- ChangeLog   30 Mar 2008 17:09:31 -0000      1.6094
+++ ChangeLog   30 Mar 2008 18:23:19 -0000      1.6095
@@ -1,3 +1,8 @@
+2008-03-30  Dossy Shiobara <address@hidden>
+
+       * macros/gnashpkgtool.m4: Add support for pkgname-config scripts
+         that don't understand --cxxflags, such as nspr-config.
+
 2008-03-30 Sandro Santilli <address@hidden>
 
        * server/asobj/string.cpp: 'length' is an instance, not class, member,

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- macros/gnashpkgtool.m4      26 Mar 2008 22:12:00 -0000      1.48
+++ macros/gnashpkgtool.m4      30 Mar 2008 18:23:20 -0000      1.49
@@ -77,7 +77,10 @@
       AC_PATH_PROG(UP[]_CONFIG, $1-config)
       if test x"${UP[]_CONFIG}" != x; then
         AC_MSG_CHECKING([for $2 header using $1-config])
-        ac_cv_path_$1_incl="`${UP[]_CONFIG} --cxxflags`"
+        ac_cv_path_$1_incl="`${UP[]_CONFIG} --cxxflags 2>/dev/null`"
+        if test x"${ac_cv_path_$1_incl}" = x; then
+          ac_cv_path_$1_incl="`${UP[]_CONFIG} --cflags 2>/dev/null`"
+        fi
         AC_MSG_RESULT(${ac_cv_path_$1_incl})
         found_$1_incl="yes"
       fi