[Gnash-commit] gnash/macros gnashpkgtool.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/24 02:11:04

Modified files:
        macros         : gnashpkgtool.m4 

Log message:
        Avoid excessive output.

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

Patches:
Index: gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnashpkgtool.m4     24 Oct 2006 01:26:59 -0000      1.6
+++ gnashpkgtool.m4     24 Oct 2006 02:11:04 -0000      1.7
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: gnashpkgtool.m4,v 1.6 2006/10/24 01:26:59 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.7 2006/10/24 02:11:04 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()..
@@ -92,6 +92,8 @@
                        fi
                done
                fi
+               AC_MSG_CHECKING([for $2 header])
+               AC_MSG_RESULT(${ac_cv_path_$1_incl})
                ])
        else
                if test x"${ac_cv_path_$1_incl}" != x"/usr/include"; then
@@ -101,12 +103,8 @@
                fi
        fi
        
-       AC_MSG_CHECKING([for $2 header])
-       AC_MSG_RESULT(${ac_cv_path_$1_incl})
-
        if test x"${ac_cv_path_$1_incl}" != x ; then
                UP[]_CFLAGS="${ac_cv_path_$1_incl}"
-               AC_MSG_RESULT(${ac_cv_path_$1_incl})
        else
                UP[]_CFLAGS=""
        fi
@@ -115,10 +113,11 @@
        AC_SUBST(UP[]_CFLAGS)
 ])
 
-dnl AC_DEFUN([GNASH_PKG_LIBS], dnl
-dnl pushdef([UP], translit([$1], [a-z], [A-Z]))dnl Uppercase
-dnl pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
-
-dnl    AM_CONDITIONAL(HAVE_UP[], [test x$1 = xyes])
-dnl    AC_SUBST(UP[]_LIBS)
-dnl])
+AC_DEFUN([GNASH_PKG_LIBS], dnl
+[
+pushdef([UP], translit([$1], [a-z], [A-Z]))dnl Uppercase
+pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
+
+       AM_CONDITIONAL(HAVE_UP[], [test x$1 = xyes])
+       AC_SUBST(UP[]_LIBS)
+])