[Gnash-commit] gnash ChangeLog configure.ac macros/gnashpkgtoo...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/23 13:01:51

Modified files:
        .              : ChangeLog configure.ac 
        macros         : gnashpkgtool.m4 kde.m4 

Log message:
        Fixed a typo, don't look for X-libs/headers if found.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1360&r2=1.1361
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.180&r2=1.181
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1360
retrieving revision 1.1361
diff -u -b -r1.1360 -r1.1361
--- ChangeLog   23 Oct 2006 11:04:30 -0000      1.1360
+++ ChangeLog   23 Oct 2006 13:01:51 -0000      1.1361
@@ -1,6 +1,7 @@
 2006-10-23 Markus Gothe <address@hidden>
 
        * macro/jpeg.m4: Fixed a bug.
+       * macro/kde.m4: Fixed typo.
 
 2006-10-23 Sandro Santilli <address@hidden>
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- configure.ac        22 Oct 2006 22:18:26 -0000      1.180
+++ configure.ac        23 Oct 2006 13:01:51 -0000      1.181
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.180 2006/10/22 22:18:26 nihilus Exp $
+dnl $Id: configure.ac,v 1.181 2006/10/23 13:01:51 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -464,6 +464,7 @@
 GNASH_HASHMAP
 dnl AC_CHECK_LIB(c, mremap)
 GNASH_PATH_ZLIB
+dnl GNASH_PKG_INCLUDES(jpeg, [jpeglib.h], [jpeg images])
 GNASH_PATH_JPEG
 
 dnl currently unused

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/gnashpkgtool.m4      21 Oct 2006 22:20:02 -0000      1.2
+++ macros/gnashpkgtool.m4      23 Oct 2006 13:01:51 -0000      1.3
@@ -35,9 +35,74 @@
 dnl  
 dnl 
 
-dnl $Id: gnashpkgtool.m4,v 1.2 2006/10/21 22:20:02 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.3 2006/10/23 13:01:51 nihilus Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
-dnl for packages.
+dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
 
+AC_DEFUN([GNASH_PKG_INCLUDES], dnl (jpeg, jpeglib.h, "jpeg images")
+[
+  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)
 
+  if test x"$1" = x"yes"; then
+    dnl Look for the header
+  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
+      if test -f ${with_$1_incl}/$2 ; then
+       ac_cv_path_$1_incl=-I`(cd ${with_$1_incl}; pwd)`
+      else
+       AC_MSG_ERROR([${with_$1_incl} directory doesn't contain $2])
+      fi
+    fi
+    ])
+
+    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_$1_incl}" = x; then
+      $PKG_CONFIG --exists $1 && ac_cv_path_$1_incl=`$PKG_CONFIG --cflags $1`
+    fi
+
+    dnl If the path hasn't been specified, go look for it.
+    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 
/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 x"$i" != x"/usr/include"; then
+             ac_cv_path_$1_incl="-I$i"
+             break
+            else
+             ac_cv_path_$1_incl=""
+             break
+           fi
+         fi
+        done
+      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}"
+       else
+       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}"
+      AC_MSG_RESULT(${ac_cv_path_$1_incl})
+    else
+      $1_CFLAGS=""
+    fi
+
+  AM_CONDITIONAL(HAVE_$1, [test x$1 = xyes])
+
+  AC_SUBST($1_CFLAGS)
+
+])

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- macros/kde.m4       22 Oct 2006 10:55:05 -0000      1.17
+++ macros/kde.m4       23 Oct 2006 13:01:51 -0000      1.18
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: kde.m4,v 1.17 2006/10/22 10:55:05 nihilus Exp $
+dnl $Id: kde.m4,v 1.18 2006/10/23 13:01:51 nihilus Exp $
 
 # KDE_PATH_X_DIRECT
 dnl Internal subroutine of AC_PATH_X.
@@ -865,21 +865,21 @@
 AC_MSG_CHECKING(for X)
 
 AC_CACHE_VAL(kde_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
+[ dnl One or both of the vars are not set, and there is no cached value.
+if test "{$ac_x_includes+set}" = set || test "$ac_x_includes" = NONE; then
    kde_x_includes=NO
 else
-   kde_x_includes=$x_includes
+   kde_x_includes=$ac_x_includes
 fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
+if test "{$ac_x_libraries+set}" = set || test "$ac_x_libraries" = NONE; then
    kde_x_libraries=NO
 else
-   kde_x_libraries=$x_libraries
+   kde_x_libraries=$ac_x_libraries
 fi
 
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
+dnl below we use the standard autoconf calls
+dnl ac_x_libraries=$kde_x_libraries
+dnl ac_x_includes=$kde_x_includes
 
 KDE_PATH_X_DIRECT
 dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.