[Gnash-commit] gnash/macros gnashpkgtool.m4

[Markus Gothe]

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

Modified files:
        macros         : gnashpkgtool.m4 

Log message:
        Optimized...

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

Patches:
Index: gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gnashpkgtool.m4     25 Nov 2006 23:56:51 -0000      1.25
+++ gnashpkgtool.m4     26 Nov 2006 00:11:07 -0000      1.26
@@ -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.25 2006/11/25 23:56:51 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.26 2006/11/26 00:11:07 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()..
@@ -151,9 +151,9 @@
                $PKG_CONFIG --exists libDOWN[] && 
ac_cv_path_$1_lib=`$PKG_CONFIG --libs libDOWN[]`
        fi
 
+       if test x"${ac_cv_path_$1_lib}" = x; then
        ac_save_LIBS=$LIBS
        LIBS=""
-       if test x"${ac_cv_path_$1_lib}" = x; then
                AC_SEARCH_LIBS($2, $1 $name, [ac_cv_path_$1_lib="$LIBS $5"],[
                libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 
${prefix}/lib32 ${prefix}/lib /usr/lib64 /usr/lib32 /usr/nekoware/lib 
/usr/freeware/lib /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib 
/pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib 
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib 
/usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib64 /opt/mesa/lib .. ../.."
                for i in $libslist; do
@@ -179,9 +179,8 @@
                                fi
                        fi
                done])      
-       fi
-
        LIBS=$ac_save_LIBS
+       fi
 
        AC_MSG_CHECKING([for lib$1 library])      
        AC_MSG_RESULT(${ac_cv_path_$1_lib})