[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/gtk2.m4
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog macros/gtk2.m4 |
Date: |
Sun, 17 Dec 2006 21:29:42 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/12/17 21:29:42
Modified files:
. : ChangeLog
macros : gtk2.m4
Log message:
Fixed lib-finding for GTK2.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1952&r2=1.1953
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.35&r2=1.36
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1952
retrieving revision 1.1953
diff -u -b -r1.1952 -r1.1953
--- ChangeLog 17 Dec 2006 20:24:57 -0000 1.1952
+++ ChangeLog 17 Dec 2006 21:29:42 -0000 1.1953
@@ -36,7 +36,7 @@
* libgeometry/Range2D.h: static_cast + using namespace std (for wicked
compilers, like MIPSPRO ;)).
* libbase/hash_wrapper: fixed namespace for find().
- * macros/gtk2.m4: Typos
+ * macros/gtk2.m4: Typos, fixed lib-finding.
2006-12-16 Rob Savoye <address@hidden>
Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- macros/gtk2.m4 17 Dec 2006 20:19:16 -0000 1.35
+++ macros/gtk2.m4 17 Dec 2006 21:29:42 -0000 1.36
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: gtk2.m4,v 1.35 2006/12/17 20:19:16 nihilus Exp $
+dnl $Id: gtk2.m4,v 1.36 2006/12/17 21:29:42 nihilus Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -101,13 +101,19 @@
AC_ARG_WITH(gtk2_lib,
AC_HELP_STRING([--with-gtk2-lib], [directory where gtk2 library is]),
with_gtk2_lib=${withval})
-
- dnl disabled as semantic is not really clear to me:
- dnl when should we set the cache ? what should we set in it ?
- dnl should any piece of code get disabled if a cache exists ?
- dnl AC_CACHE_VAL(ac_cv_path_gtk2_lib, [
ac_cv_path_gtk2_lib=-L${with_gtk2_lib}])
-
- dnl Use PKG_CONFIG only if no --with-gtk2-lib has been specified
+ AC_CACHE_VAL(ac_cv_path_gtk2_lib,[
+ if test x"${with_gtk2_lib}" != x ; then
+ if test -f ${with_gtk2_lib}/libgtk-x11-2.0.so; then
+ if test -f ${with_gtk2_lib}/libgdk-x11-2.0; then
+ ac_cv_path_gtk2_lib=-I`(cd ${with_gtk2_lib}; pwd)`
+ else
+ AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain
libgdk-x11-2.0])
+ fi
+ else
+ AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain
libgtk-x11-2.0.so])
+ fi
+ fi
+ ])
if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
$PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG
--libs gtk+-2.0`