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

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/26 22:12:00

Modified files:
        .              : ChangeLog 
        macros         : gnashpkgtool.m4 

Log message:
        Add support for package-config scripts (i.e., fltk2-config,
        xml2-config, etc.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6036&r2=1.6037
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6036
retrieving revision 1.6037
diff -u -b -r1.6036 -r1.6037
--- ChangeLog   26 Mar 2008 21:38:32 -0000      1.6036
+++ ChangeLog   26 Mar 2008 22:12:00 -0000      1.6037
@@ -1,3 +1,8 @@
+2008-03-26  Dossy Shiobara <address@hidden>
+
+       * macros/gnashpkgtool.m4: Add support for package-config scripts
+         (i.e., fltk2-config, xml2-config, etc.)
+
 2008-03-26 Benjamin Wolsey <address@hidden>
 
        * server/vm/ActionExec.h

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- macros/gnashpkgtool.m4      5 Mar 2008 03:55:56 -0000       1.47
+++ macros/gnashpkgtool.m4      26 Mar 2008 22:12:00 -0000      1.48
@@ -73,6 +73,15 @@
              AC_MSG_RESULT(not found)
            fi
     fi
+    if test x"${ac_cv_path_$1_incl}" = x; then
+      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_MSG_RESULT(${ac_cv_path_$1_incl})
+        found_$1_incl="yes"
+      fi
+    fi
        fi
 
        dnl If the path hasn't been specified, go look for it.
@@ -182,6 +191,14 @@
                  AC_MSG_CHECKING([for lib$1 library])      
                  AC_MSG_RESULT(${ac_cv_path_$1_lib})
          fi
+    if test x"${ac_cv_path_$1_lib}" = x; then
+      AC_PATH_PROG(UP[]_CONFIG, $1-config)
+      if test x"${UP[]_CONFIG}" != x; then
+        AC_MSG_CHECKING([for lib$1 library using $1-config])
+        ac_cv_path_$1_lib="`${UP[]_CONFIG} --libs`"
+        AC_MSG_RESULT(${ac_cv_path_$1_lib})
+      fi
+    fi
   fi
 
        if test x"${ac_cv_path_$1_lib}" = x; then