[Gnash-commit] gnash ChangeLog macros/atk.m4 macros/cairo.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/10 22:23:15

Modified files:
        .              : ChangeLog 
        macros         : atk.m4 cairo.m4 

Log message:
        Added pkg-config-support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1126&r2=1.1127
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1126
retrieving revision 1.1127
diff -u -b -r1.1126 -r1.1127
--- ChangeLog   10 Oct 2006 21:42:00 -0000      1.1126
+++ ChangeLog   10 Oct 2006 22:23:15 -0000      1.1127
@@ -30,6 +30,7 @@
        * macros/glibmm.m4: Removed!
        * macros/glib.m4: Extended pkg-config support.
        * macros/gtk2.m4: Extended pkg-config support.
+       * macros/cairo.m4: Extended pkg-config support.
        * macros/gtkglext.m4: Extended pkg-config support.
        * configure.ac: #define HAVE_STRINGCASECMP 1, Fixed BOOST.
 

Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- macros/atk.m4       10 Oct 2006 18:18:20 -0000      1.16
+++ macros/atk.m4       10 Oct 2006 22:23:15 -0000      1.17
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: atk.m4,v 1.16 2006/10/10 18:18:20 nihilus Exp $
+dnl $Id: atk.m4,v 1.17 2006/10/10 22:23:15 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_ATK],
 [
@@ -79,7 +79,7 @@
   else
     AC_MSG_RESULT(${gnash_atk_version})
     if test x"$PKG_CONFIG" != x; then
-       $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion 
atk | cut -d "." -f 1`
+       $PKG_CONFIG --exists atk && gnash_atk_version=`$PKG_CONFIG --modversion 
atk | cut -d "." -f 1 | awk '{print $1".0"}'`
     fi
   fi
 

Index: macros/cairo.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/cairo.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- macros/cairo.m4     9 Oct 2006 04:39:06 -0000       1.8
+++ macros/cairo.m4     10 Oct 2006 22:23:15 -0000      1.9
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: cairo.m4,v 1.9 2006/10/10 22:23:15 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_CAIRO],
 [
   dnl Look for the header
@@ -49,6 +51,11 @@
     fi
   ])
 
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_cairo_incl}" = x; then
+    $PKG_CONFIG --exists cairo && ac_cv_path_cairo_incl=`$PKG_CONFIG --cflags 
cairo`
+    $PKG_CONFIG --exists cairo && gnash_cairo_version=`$PKG_CONFIG 
--modversion cairo`  
+  fi
+  
   dnl we can use cairo even if no plugin is enabled
   dnl if test x"$plugin" = x"yes"; then
 
@@ -56,7 +63,6 @@
     if test x"${ac_cv_path_cairo_incl}" = x; then
       AC_CHECK_HEADERS(cairo/cairo.h, [ac_cv_path_cairo_incl=""],[
         if test x"${ac_cv_path_cairo_incl}" = x; then
-          AC_MSG_CHECKING([for Cairo header])
           incllist="/sw/include /usr/local/include /home/latest/include 
/opt/include /opt/local/include /usr/include /usr/pkg/include .. ../.."
 
           for i in $incllist; do
@@ -66,20 +72,18 @@
           done
         fi
       ])
-    fi
-
     if test x"${ac_cv_path_cairo_incl}" != x"/usr/include"; then
-      ac_cv_path_cairo_incl="${ac_cv_path_cairo_incl}"
+             ac_cv_path_cairo_incl="-I${ac_cv_path_cairo_incl}"
     else
       ac_cv_path_cairo_incl=""
     fi
 
-    if test x"${ac_cv_path_cairo_incl}" != x ; then
-      AC_MSG_RESULT(yes)
     else
-      AC_MSG_RESULT(no)
+           AC_MSG_CHECKING([for libcairo header])
+           AC_MSG_RESULT(${ac_cv_path_cairo_incl}) 
     fi
 
+
     dnl Look for the library
     AC_ARG_WITH(cairo_lib, [  --with-cairo-lib          directory where cairo 
library is], with_cairo_lib=${withval})
       AC_CACHE_VAL(ac_cv_path_cairo_lib,[
@@ -92,41 +96,36 @@
       fi
     ])
 
+  if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_cairo_lib}" = x; then
+    $PKG_CONFIG --exists cairo && ac_cv_path_cairo_lib=`$PKG_CONFIG --libs 
cairo`
+  fi
+
     dnl If the header doesn't exist, there is no point looking for the library.
     if test x"${ac_cv_path_cairo_lib}" = x; then
       AC_CHECK_LIB(cairo, cairo_status, [ac_cv_path_cairo_lib="-lcairo"],[
-        AC_MSG_CHECKING([for libcairo library])
         libslist="/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib 
/opt/lib  /opt/local/lib /usr/pkg/lib .. ../.."
         for i in $libslist; do
          if test -f $i/libcairo.a -o -f $i/libcairo.so; then
            if test x"$i" != x"/usr/lib"; then
              ac_cv_path_cairo_lib="-L$i -lcairo"
-              AC_MSG_RESULT(${ac_cv_path_cairo_lib})
              break
             else
               ac_cv_path_cairo_lib=""
-              AC_MSG_RESULT(yes)
              break
            fi
          fi
         done
       ])
     else
-      if test -f ${ac_cv_path_cairo_lib}/libcairo.a -o -f 
${ac_cv_path_cairo_lib}/libcairo.so; then
-
-        if test x"${ac_cv_path_cairo_lib}" != x"/usr/lib"; then
-         ac_cv_path_cairo_lib="-L${ac_cv_path_cairo_lib}"
-         else
-         ac_cv_path_cairo_lib=""
-        fi
-      fi
+           AC_MSG_CHECKING([for libcairo library])
+           AC_MSG_RESULT(${ac_cv_path_cairo_lib})    
     fi
 
   dnl we seek cairo even if no plugin is enabled
   dnl fi
 
   if test x"${ac_cv_path_cairo_incl}" != x ; then
-    CAIRO_CFLAGS="-I${ac_cv_path_cairo_incl}"
+    CAIRO_CFLAGS="${ac_cv_path_cairo_incl}"
   else
     CAIRO_CFLAGS=""
   fi