[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/gnashpkgtool.m4
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog macros/gnashpkgtool.m4 |
Date: |
Thu, 26 Oct 2006 21:34:55 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/10/26 21:34:55
Modified files:
. : ChangeLog
macros : gnashpkgtool.m4
Log message:
Added GNASH_PKG_FIND, fixed typos...
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1405&r2=1.1406
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1405
retrieving revision 1.1406
diff -u -b -r1.1405 -r1.1406
--- ChangeLog 26 Oct 2006 21:28:53 -0000 1.1405
+++ ChangeLog 26 Oct 2006 21:34:55 -0000 1.1406
@@ -1,6 +1,6 @@
2006-10-26 Markus Gothe <address@hidden>
- * macros/gnashpkgtool.m4: Added GNASH_PKG_LIBS.
+ * macros/gnashpkgtool.m4: Added GNASH_PKG_LIBS. Added GNASH_PKG_FIND.
2006-10-26 Sandro Santilli <address@hidden>
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- macros/gnashpkgtool.m4 26 Oct 2006 21:28:33 -0000 1.10
+++ macros/gnashpkgtool.m4 26 Oct 2006 21:34:55 -0000 1.11
@@ -35,7 +35,7 @@
dnl
dnl
-dnl $Id: gnashpkgtool.m4,v 1.10 2006/10/26 21:28:33 nihilus Exp $
+dnl $Id: gnashpkgtool.m4,v 1.11 2006/10/26 21:34:55 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()..
@@ -86,7 +86,7 @@
fi
else
if test -f $i/$1/$2; then
- ac_cv_path_png_incl="-I$i/$1"
+ ac_cv_path_$1_incl="-I$i/$1"
break
fi
fi
@@ -129,9 +129,9 @@
AC_CACHE_VAL(ac_cv_path_$1_lib,[
if test x"${with_$1_lib}" != x ; then
AC_MSG_CHECKING([for lib$1 library in specified directory])
- if test -f ${with_png_lib}/lib$1.a -o -f
${with_png_lib}/lib$1.so; then
+ if test -f ${with_$1_lib}/lib$1.a -o -f
${with_$1_lib}/lib$1.so; then
tmp=`(cd ${with_$1_lib}; pwd)`
- ac_cv_path_png_lib="-L${tmp} -l$1"
+ ac_cv_path_$1_lib="-L${tmp} -l$1"
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([${with_$1_lib} directory doesn't contain
library $1.])
@@ -177,3 +177,9 @@
popdef([UP])
popdef([DOWN])
])
+
+AC_DEFUN([GNASH_PKG_FIND], dnl GNASH_PKG_FIND(cairo, [cairo.h], [cairo render
library], cairo_status)
+[
+GNASH_PKG_INCLUDES($1, $2, $3)
+GNASH_PKG_LIBS($1, $4, $3)
+])