[Gnash-commit] gnash/macros gnashpkgtool.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/26 00:21:02

Modified files:
        macros         : gnashpkgtool.m4 

Log message:
        Fixing glib issue with pkg-config(?)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gnashpkgtool.m4     26 Nov 2006 00:11:07 -0000      1.26
+++ gnashpkgtool.m4     26 Nov 2006 00:21:02 -0000      1.27
@@ -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.26 2006/11/26 00:11:07 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.27 2006/11/26 00:21:02 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()..
@@ -57,11 +57,10 @@
                ])
 
        if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_incl}" = x; then
-               $PKG_CONFIG --exists $name && ac_cv_path_$1_incl=`$PKG_CONFIG 
--cflags $name`
-               $PKG_CONFIG --exists lib$name && ac_cv_path_$1_lib=`$PKG_CONFIG 
--cflags lib$name`
-
-               $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_incl=`$PKG_CONFIG 
--cflags DOWN[]`
                $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`
        fi
 
        dnl If the path hasn't been specified, go look for it.
@@ -144,11 +143,10 @@
 
        dnl If the header doesn't exist, there is no point looking for the 
library.
        if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_lib}" = x; then
+               $PKG_CONFIG --exists libDOWN[] && 
ac_cv_path_$1_lib=`$PKG_CONFIG --libs libDOWN[]`
+               $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG 
--libs DOWN[]`
                $PKG_CONFIG --exists lib$name && ac_cv_path_$1_lib=`$PKG_CONFIG 
--libs lib$name`
                $PKG_CONFIG --exists $name && ac_cv_path_$1_lib=`$PKG_CONFIG 
--libs $name`
-
-               $PKG_CONFIG --exists DOWN[] && ac_cv_path_$1_lib=`$PKG_CONFIG 
--libs DOWN[]`
-               $PKG_CONFIG --exists libDOWN[] && 
ac_cv_path_$1_lib=`$PKG_CONFIG --libs libDOWN[]`
        fi
 
        if test x"${ac_cv_path_$1_lib}" = x; then