[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/macros gtk2.m4
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash/macros gtk2.m4 |
Date: |
Sun, 17 Dec 2006 19:47:31 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/12/17 19:47:31
Modified files:
macros : gtk2.m4
Log message:
Fixes.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gtk2.m4 9 Nov 2006 18:28:15 -0000 1.32
+++ gtk2.m4 17 Dec 2006 19:47:31 -0000 1.33
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: gtk2.m4,v 1.32 2006/11/09 18:28:15 nihilus Exp $
+dnl $Id: gtk2.m4,v 1.33 2006/12/17 19:47:31 nihilus Exp $
AC_DEFUN([GNASH_PATH_GTK2],
[
@@ -74,7 +74,7 @@
AC_CHECK_HEADERS(gtk/gtk.h, [ac_cv_path_gtk2_incl=""],[
if test x"${ac_cv_path_gtk2_incl}" = x; then
AC_MSG_CHECKING([for libgtk2 header])
- incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/lib /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include .. ../.."
+ incllist="${prefix}/${target_alias}/include ${prefix}/include
/sw/include /opt/local/lib /usr/local/include /usr/X11R6/include
/home/latest/include /opt/include /opt/local/include /usr/include
/usr/pkg/include /usr/nekoware/include /usr/freeware/include /usr/ .. ../.."
for i in $incllist; do
if test -f $i/${gnash_gtk2_topdir}/gtk/gtk.h; then
@@ -108,9 +108,10 @@
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
- if test x"$PKG_CONFIG" != x -a x"${with_gtk2_lib}" = x; then
+
+if test x"$PKG_CONFIG" != x -a x"${with_gtk2_lib}" = x; then
$PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG --libs
gtk+-2.0`
- fi
+fi
dnl If the header doesn't exist, there is no point looking for
dnl the library.
@@ -142,7 +143,7 @@
AC_MSG_RESULT($ac_cv_path_gtk2_lib)
if test x"${ac_cv_path_gtk2_incl}" != x; then
- libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib
/opt/local/lib /usr/nekoware/lib /usr/freeware/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/gtk-${gnash_gtk2_version}/include/gdkconfig.h; then
GTK2_CFLAGS="-I${i}/gtk-${gnash_gtk2_version}/include"
- [Gnash-commit] gnash/macros gtk2.m4,
Markus Gothe <=