[Gnash-commit] gnash ChangeLog macros/gtk2.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/10 21:24:03

Modified files:
        .              : ChangeLog 
        macros         : gtk2.m4 

Log message:
        Extended pkg-config support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1124&r2=1.1125
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1124
retrieving revision 1.1125
diff -u -b -r1.1124 -r1.1125
--- ChangeLog   10 Oct 2006 21:06:28 -0000      1.1124
+++ ChangeLog   10 Oct 2006 21:24:03 -0000      1.1125
@@ -29,6 +29,7 @@
        * macros/curl.m4: Added id-tag.
        * macros/glibmm.m4: Removed!
        * macros/glib.m4: Extended pkg-config support.
+       * macros/gtk2.m4: Extended pkg-config support.
        * configure.ac: #define HAVE_STRINGCASECMP 1, Fixed BOOST.
 
 2006-10-10 Sandro Santilli <address@hidden>

Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/gtk2.m4      9 Oct 2006 04:39:06 -0000       1.24
+++ macros/gtk2.m4      10 Oct 2006 21:24:03 -0000      1.25
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: gtk2.m4,v 1.25 2006/10/10 21:24:03 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_GTK2],
 [
   gnash_gtk2_version=""
@@ -54,17 +56,16 @@
   ])
 
 
-  pkg=no
   if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_incl}" = x; then
-    ac_cv_path_gtk2_incl=`$PKG_CONFIG --cflags gtk+-2.0`
-    pkg=yes
+    $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_incl=`$PKG_CONFIG 
--cflags gtk+-2.0`
+    $PKG_CONFIG --exists gtk+-2.0 && gnash_gtk2_version=`$PKG_CONFIG 
--modversion gtk+-2.0`
   fi
 
   dnl Attempt to find the top level directory, which unfortunately has a
   dnl version number attached. At least on Debain based systems, this
   dnl doesn't seem to get a directory that is unversioned.
-  if test x"${gnash_gtk2_version}" = x; then
     AC_MSG_CHECKING([for the Gtk Version])
+  if test x"${gnash_gtk2_version}" = x; then
     pathlist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /usr/X11R6/include /home/latest/include /opt/include 
/opt/local/include /usr/include /usr/pkg/include .. ../.."
 
     gnash_gtk2_topdir=""
@@ -78,13 +79,8 @@
         fi
       done
     done
-
-    if test x"${gnash_gtk2_topdir}" = x; then
-      AC_MSG_RESULT(none)
-    else
-      AC_MSG_RESULT([${gnash_gtk2_version}])
-    fi
   fi
+  AC_MSG_RESULT(${gnash_gtk2_version})
 
 
   dnl If the path hasn't been specified, go look for it.
@@ -124,14 +120,14 @@
 
 
   if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
-    ac_cv_path_gtk2_lib=`$PKG_CONFIG --libs gtk+-2.0`
+    $PKG_CONFIG --exists gtk+-2.0 && ac_cv_path_gtk2_lib=`$PKG_CONFIG --libs 
gtk+-2.0`
   fi
 
 dnl If the header doesn't exist, there is no point looking for
 dnl the library. 
-  if test x"${ac_cv_path_gtk2_incl}" != x; then
-    AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0 
-lgdk-x11-2.0"],[
       AC_MSG_CHECKING([for libgtk2 library])
+  if test x"${ac_cv_path_gtk2_incl}" != x -a x"$ac_cv_path_gtk2_lib" = x; then
+    AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [ac_cv_path_gtk2_lib="-lgtk-x11-2.0 
-lgdk-x11-2.0"],[
       libslist="${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 .. ../.."
       for i in $libslist; do
         if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
@@ -159,6 +155,7 @@
       fi
     fi
   fi
+ AC_MSG_RESULT($ac_cv_path_gtk2_lib)
 
   if test x"${ac_cv_path_gtk2_incl}" != x; then
     libslist="${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 .. ../.."