[Gnash-commit] gnash configure.ac macros/glib.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/11/26 00:07:11

Modified files:
        .              : configure.ac 
Removed files:
        macros         : glib.m4 

Log message:
        Got rid of this one too...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.213&r2=1.214
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.22&r2=0

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -b -r1.213 -r1.214
--- configure.ac        25 Nov 2006 23:51:39 -0000      1.213
+++ configure.ac        26 Nov 2006 00:07:10 -0000      1.214
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.213 2006/11/25 23:51:39 nihilus Exp $
+dnl $Id: configure.ac,v 1.214 2006/11/26 00:07:10 nihilus Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -538,7 +538,8 @@
 
 dnl Need GLIB for both GTK and GST
 if test x${gui} = "xgtk" -o x${sound_handler} = "xgst"; then
-   GNASH_PATH_GLIB
+       GNASH_PKG_FIND(glib, [glib.h], [], g_io_channel_init, [2.0])
+       AM_CONDITIONAL(HAVE_GLIB, [ test x$has_glib = xyes ])
 fi
 
 if test x$gui = xgtk; then

Index: macros/glib.m4
===================================================================
RCS file: macros/glib.m4
diff -N macros/glib.m4
--- macros/glib.m4      9 Nov 2006 19:06:33 -0000       1.22
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,151 +0,0 @@
-dnl  
-dnl    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl  
-dnl  This program is free software; you can redistribute it and/or modify
-dnl  it under the terms of the GNU General Public License as published by
-dnl  the Free Software Foundation; either version 2 of the License, or
-dnl  (at your option) any later version.
-dnl  
-dnl  This program is distributed in the hope that it will be useful,
-dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl  GNU General Public License for more details.
-dnl  You should have received a copy of the GNU General Public License
-dnl  along with this program; if not, write to the Free Software
-dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-dnl  
-dnl 
-
-dnl $Id: glib.m4,v 1.22 2006/11/09 19:06:33 nihilus Exp $
-
-AC_DEFUN([GNASH_PATH_GLIB],
-[
-    dnl Look for the header
-  AC_ARG_WITH(glib_incl, AC_HELP_STRING([--with-glib-incl], [directory where 
libglib header is]), with_glib_incl=${withval})
-    AC_CACHE_VAL(ac_cv_path_glib_incl,[
-    if test x"${with_glib_incl}" != x ; then
-      if test -f ${with_glib_incl}/glib.h ; then
-       ac_cv_path_glib_incl="-I`(cd ${with_glib_incl}; pwd)`"
-      else
-       AC_MSG_ERROR([${with_glib_incl} directory doesn't contain glib.h])
-      fi
-    fi
-  ])
-
-  dnl Try with pkg-config
-
-if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_incl}" = x; then
-       $PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_incl=`$PKG_CONFIG 
--cflags glib-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.
-
-AC_MSG_CHECKING([for the Glib Version])
-
-if test x"$PKG_CONFIG" != x; then
-       $PKG_CONFIG --exists glib-2.0 && gnash_glib_version=`$PKG_CONFIG 
--modversion glib-2.0`
-fi
-  
-  if test x"${gnash_glib_version}" = x; then
-    pathlist="${with_glib_incl} ${prefix}/${target_alias}/include 
${prefix}/include /sw/include /opt/local/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
-
-    gnash_glib_topdir=""
-    gnash_glib_version=""
-    for i in $pathlist; do
-      for j in `ls -dr $i/glib-[[0-9]].[[0-9]] 2>/dev/null`; do
-        if test -f $j/glib.h; then
-          gnash_glib_topdir=`basename $j`
-          gnash_glib_version=`echo ${gnash_glib_topdir} | sed -e 's:glib-::'`
-          break
-        fi
-      done
-      if test x$gnash_glib_version != x; then
-       break;
-      fi
-    done
-  fi
-
-  AC_MSG_RESULT([${gnash_glib_version}])
-
-  dnl If the path hasn't been specified, go look for it.
-  if test x"${ac_cv_path_glib_incl}" = x; then
-    AC_CHECK_HEADERS(glib.h, [ac_cv_path_glib_incl=""],[
-      if test x"${ac_cv_path_glib_incl}" = x; then
-        incllist="${prefix}/${target_alias}/include ${prefix}/include 
/sw/include /opt/local/include /usr/local/include /home/latest/include 
/usr/include /opt/include /usr/pkg/include .. ../.."
-
-        for i in $incllist; do
-          if test -f $i/glib.h; then
-            ac_cv_path_glib_incl="-I$i"
-            break
-          else
-            if test -f $i/${gnash_glib_topdir}/glib.h; then
-              ac_cv_path_glib_incl="-I$i/${gnash_glib_topdir}"
-              break
-            fi
-          fi
-        done
-      fi
-    ])
-  fi
- AC_MSG_CHECKING([for libglib header])  
- AC_MSG_RESULT(${ac_cv_path_glib_incl})
- 
-  dnl Look for the library
-  AC_ARG_WITH(glib_lib, AC_HELP_STRING([--with-glib-lib], [directory where 
glib library is]), with_glib_lib=${withval})
-    AC_CACHE_VAL(ac_cv_path_glib_lib,[
-    if test x"${with_glib_lib}" != x ; then
-      if test -f ${with_glib_lib}/libglib-${gnash_glib_version}.a -o -f 
${with_glib_lib}/libglib-${gnash_glib_version}.so; then
-        ac_cv_path_glib_lib="-L`(cd ${with_glib_lib}; pwd)` 
-lglib-${gnash_glib_version}"
-      else
-        AC_MSG_ERROR([${with_glib_lib} directory doesn't contain libglib.])
-      fi
-    fi
-  ])
-
-  if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_lib}" = x; then
-    $PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_lib=`$PKG_CONFIG --libs 
glib-2.0`
-  fi
-
-  if test x"${ac_cv_path_glib_lib}" = x; then
-    AC_CHECK_LIB(glib-${gnash_glib_version}, g_io_channel_init, 
[ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"],[
-      libslist="${prefix}/${target_alias}/lib ${ac_cv_path_glib_lib} 
${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /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/libglib-${gnash_glib_version}.a -o -f 
$i/libglib-${gnash_glib_version}.so; then
-          if test x"$i" != x"/usr/lib"; then
-            ac_cv_path_glib_lib="-L$i -lglib-${gnash_glib_version}"
-            break
-          else
-            ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"
-            break
-          fi
-        else
-          if test -f $i/libglib-${gnash_glib_version}.a -o -f 
$i/libglib-${gnash_glib_version}.so; then
-            ac_cv_path_glib_lib="-L$i/${gnash_glib_topdir} 
-lglib-${gnash_glib_version}"
-            break
-          fi
-        fi
-      done
-    ])
-  fi
- AC_MSG_CHECKING([for libglib library])
- AC_MSG_RESULT(${ac_cv_path_glib_lib})
- 
-if test x"${ac_cv_path_glib_incl}" != x; then
-       GLIB_CFLAGS="${ac_cv_path_glib_incl} $GLIB_CFLAGS"
-       AC_DEFINE([HAVE_GLIB], [1], [Has GLIB library installed])
-else
-       GLIB_CFLAGS=""
-fi
-
-if test x"${ac_cv_path_glib_lib}" != x ; then
-       GLIB_LIBS="${ac_cv_path_glib_lib}"
-else
-       GLIB_LIBS=""
-fi
-
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-])