[Gnash-commit] gnash/macros gnashpkgtool.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/24 01:18:12

Modified files:
        macros         : gnashpkgtool.m4 

Log message:
        Improvements + stub for getting libs...

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

Patches:
Index: gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnashpkgtool.m4     23 Oct 2006 23:01:09 -0000      1.4
+++ gnashpkgtool.m4     24 Oct 2006 01:18:12 -0000      1.5
@@ -35,22 +35,28 @@
 dnl  
 dnl 
 
-dnl $Id: gnashpkgtool.m4,v 1.4 2006/10/23 23:01:09 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.5 2006/10/24 01:18:12 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().
+dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS()..
 
 AC_DEFUN([GNASH_PKG_INCLUDES], dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg 
images])
 [
-  AC_ARG_ENABLE($1, AC_HELP_STRING([--enable-$1], [Enable support for $3.]),
-  [case "${enableval}" in
+pushdef([UP], translit([$1], [a-z], [A-Z]))dnl Uppercase
+pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl Lowercase
+  
+AC_ARG_ENABLE($1, AC_HELP_STRING([--enable-$1], [Enable support for $3.]),
+[case "${enableval}" in
     yes) $1=yes ;;
     no)  $1=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
-  esac], $1=yes)
+       *)   
+       AC_MSG_ERROR([bad value ${enableval} for enable-$1 option]) ;;
+esac], $1=yes)
+
+unset ac_cv_path_$1_incl
 
-  if test x"$1" = x"yes"; then
-    dnl Look for the header
+dnl Look for the header
+if test x"$1" = x"yes"; then
   AC_ARG_WITH($1_incl, AC_HELP_STRING([--with-$1-incl], [Directory where $2 
header is]), with_$1_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_$1_incl,[
     if test x"${with_$1_incl}" != x ; then
@@ -70,10 +76,9 @@
     if test x"${ac_cv_path_$1_incl}" = x; then
       AC_CHECK_HEADERS($2, [ac_cv_path_$1_incl=""],[
       if test x"${ac_cv_path_$1_incl}" = x; then
-        incllist="${prefix}/include /sw/include /usr/nekoware/include 
/usr/freeware/include /opt/local/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
-
+               incllist="${prefix}/include /sw/include /usr/nekoware/include 
/usr/freeware/include /pkg/include /opt/local/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
         for i in $incllist; do
-         if test -f $i/$2; then
+                       if test -f $i/$1; then
            if test x"$i" != x"/usr/include"; then
              ac_cv_path_$1_incl="-I$i"
              break
@@ -81,9 +86,15 @@
              ac_cv_path_$1_incl=""
              break
            fi
+                       else
+                               if test -f $i/$1/$2; then
+                                       ac_cv_path_png_incl="-I$i/$1"
+                                       break
+                               fi  
          fi
         done
-      fi])
+               fi
+               ])
     else
       if test x"${ac_cv_path_$1_incl}" != x"/usr/include"; then
        ac_cv_path_$1_incl="-I${ac_cv_path_$1_incl}"
@@ -91,18 +102,25 @@
        ac_cv_path_$1_incl=""
       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
-      $1_CFLAGS="${ac_cv_path_$1_incl}"
+               UP[]_CFLAGS="${ac_cv_path_$1_incl}"
       AC_MSG_RESULT(${ac_cv_path_$1_incl})
     else
-      $1_CFLAGS=""
+               UP[]_CFLAGS=""
     fi
-
-  AM_CONDITIONAL(HAVE_$1, [test x$1 = xyes])
-
-  AC_SUBST($1_CFLAGS)
-
+fi
+       AM_CONDITIONAL(HAVE_UP[], [test x$1 = xyes])
+       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])