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

[Markus Gothe]

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

Modified files:
        .              : ChangeLog 
        macros         : mad.m4 

Log message:
        Quick 'n dirty pkg-config support (will fix this when I finish the 
pkg-tools m4-macros.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1335&r2=1.1336
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mad.m4?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1335
retrieving revision 1.1336
diff -u -b -r1.1335 -r1.1336
--- ChangeLog   21 Oct 2006 10:11:49 -0000      1.1335
+++ ChangeLog   21 Oct 2006 10:34:15 -0000      1.1336
@@ -12,6 +12,7 @@
          with xEmbed and GTK-1.2. (PoC from mplayerplug-in).
        * plugin/plugin.h: Removed include of gtk/gtk.h since not used.
        * macros/ffmpeg.m4: Fixed AC_MSG_*-style.
+       * macros/mad.m4: Added pkg-config support...
 
 2006-10-20  Rob Savoye  <address@hidden>
 

Index: macros/mad.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mad.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/mad.m4       15 Oct 2006 14:26:05 -0000      1.14
+++ macros/mad.m4       21 Oct 2006 10:34:15 -0000      1.15
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: mad.m4,v 1.15 2006/10/21 10:34:15 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_MAD],
 [
   dnl Look for the header
@@ -49,11 +51,15 @@
     fi
   ])
 
+
+    if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_mad_incl}" = x; then
+      $PKG_CONFIG --exists mad && ac_cv_path_mad_incl=`$PKG_CONFIG --cflags 
mad`
+    fi
+
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_mad_incl}" = x; then
     AC_CHECK_HEADERS(mad.h, [ac_cv_path_mad_incl=""],[
     if test x"${ac_cv_path_mad_incl}" = x; then
-      AC_MSG_CHECKING([for libmad header])
       incllist="${prefix}/include /sw/include /opt/local/include 
/usr/local/include /home/latest/include /opt/include /opt/local/include 
/usr/include /usr/pkg/include .. ../.."
 
       for i in $incllist; do
@@ -69,17 +75,17 @@
       done
     fi])
   else
-    AC_MSG_RESULT(-I${ac_cv_path_mad_incl})
     if test x"${ac_cv_path_mad_incl}" != x"/usr/include"; then
       ac_cv_path_mad_incl="-I${ac_cv_path_mad_incl}"
     else
       ac_cv_path_mad_incl=""
     fi
   fi
+  AC_MSG_CHECKING([for libmad header])
+  AC_MSG_RESULT(${ac_cv_path_mad_incl})
 
   if test x"${ac_cv_path_mad_incl}" != x ; then
     MAD_CFLAGS="${ac_cv_path_mad_incl}"
-    AC_MSG_RESULT(${ac_cv_path_mad_incl})
   else
     MAD_CFLAGS=""
   fi
@@ -97,19 +103,20 @@
    ])
 
    dnl If the header doesn't exist, there is no point looking for the library.
+      if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_mad_lib}" = x; then
+        $PKG_CONFIG --exists mad && ac_cv_path_mad_lib=`$PKG_CONFIG --libs mad`
+      fi
+
    if test x"${ac_cv_path_mad_lib}" = x; then
      AC_CHECK_LIB(mad, mad_copyright, [ac_cv_path_mad_lib="-lmad"],[
-       AC_MSG_CHECKING([for libmad library])
        libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /opt/local/lib 
/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/libmad.a -o -f $i/libmad.so; then
           if test x"$i" != x"/usr/lib"; then
             ac_cv_path_mad_lib="-L$i"
-             AC_MSG_RESULT(${ac_cv_path_mad_lib})
             break
            else
             ac_cv_path_mad_lib=""
-             AC_MSG_RESULT(yes)
             break
           fi
         fi
@@ -124,6 +131,8 @@
       fi
     fi
   fi
+  AC_MSG_CHECKING([for libmad library])
+  AC_MSG_RESULT(${ac_cv_path_mad_lib})
 
   if test x"${ac_cv_path_mad_lib}" != x ; then
       MAD_LIBS="${ac_cv_path_mad_lib}"