[Gnash-commit] gnash ChangeLog macros/curl.m4 macros/glib.m4 m...

[Markus Gothe]

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

Modified files:
        .              : ChangeLog 
        macros         : curl.m4 glib.m4 ogg.m4 
Removed files:
        macros         : glibmm.m4 

Log message:
        * macros/curl.m4: Added id-tag.
                * macros/glibmm.m4: Removed!
                * macros/glib.m4: Extended pkg-config support.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1123&r2=1.1124
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ogg.m4?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glibmm.m4?cvsroot=gnash&r1=1.5&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1123
retrieving revision 1.1124
diff -u -b -r1.1123 -r1.1124
--- ChangeLog   10 Oct 2006 20:26:22 -0000      1.1123
+++ ChangeLog   10 Oct 2006 21:06:28 -0000      1.1124
@@ -26,7 +26,10 @@
        * macros/ogg.m4: Pkg-config tweaks.
        * macros/boost.m4: AM_CONDITIONAL should be set IFF headers are found.
          Added /usr/pkg/include to paths.
-       * configure.ac: #define HAVE_STRINGCASECMP 1
+       * macros/curl.m4: Added id-tag.
+       * macros/glibmm.m4: Removed!
+       * macros/glib.m4: Extended pkg-config support.
+       * configure.ac: #define HAVE_STRINGCASECMP 1, Fixed BOOST.
 
 2006-10-10 Sandro Santilli <address@hidden>
 

Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/curl.m4      9 Oct 2006 04:39:06 -0000       1.5
+++ macros/curl.m4      10 Oct 2006 21:06:28 -0000      1.6
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: curl.m4,v 1.6 2006/10/10 21:06:28 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_CURL],
 [
   dnl Look for the header

Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- macros/glib.m4      9 Aug 2006 01:59:07 -0000       1.15
+++ macros/glib.m4      10 Oct 2006 21:06:28 -0000      1.16
@@ -35,6 +35,8 @@
 dnl  
 dnl 
 
+dnl $Id: glib.m4,v 1.16 2006/10/10 21:06:28 nihilus Exp $
+
 AC_DEFUN([GNASH_PATH_GLIB],
 [
     dnl Look for the header
@@ -52,17 +54,16 @@
   ])
 
   dnl Try with pkg-config
-  pkg=no
   if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_incl}" = x; then
-    ac_cv_path_glib_incl=`$PKG_CONFIG --cflags glib-2.0`
-    pkg=yes
+    $PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_incl=`$PKG_CONFIG 
--cflags glib-2.0`
+    $PKG_CONFIG --exists glib-2.0 && gnash_glib_version=`$PKG_CONFIG 
--modversion 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.
-  if test x"${gnash_glib_version}" = x; then
     AC_MSG_CHECKING([for the Glib Version])
+  if test x"${gnash_glib_version}" = x; then
     pathlist="${with_glib_incl} ${prefix}/include /sw/include 
/opt/local/include /usr/local/include /home/latest/include /opt/include 
/usr/include /usr/pkg/include .. ../.."
 
     gnash_glib_topdir=""
@@ -76,20 +77,14 @@
         fi
       done
     done
-
-    if test x"${gnash_glib_topdir}" = x; then
-      AC_MSG_RESULT(none)
-    else
-      AC_MSG_RESULT([${gnash_glib_version}])
-    fi
-
   fi
 
+  AC_MSG_RESULT([${gnash_glib_version}])
+  AC_MSG_CHECKING([for libglib header])  
   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
-        AC_MSG_CHECKING([for libglib header])
         incllist="${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
@@ -106,6 +101,7 @@
       fi
     ])
   fi
+ AC_MSG_RESULT(${ac_cv_path_glib_incl})
 
   dnl Look for the library
   AC_ARG_WITH(glib_lib, [  --with-glib-lib         directory where glib 
library is], with_glib_lib=${withval})
@@ -121,12 +117,12 @@
 
   dnl Try with pkg-config
   if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glib_lib}" = x; then
-    ac_cv_path_glib_lib=`$PKG_CONFIG --libs glib-2.0`
+    $PKG_CONFIG --exists glib-2.0 && ac_cv_path_glib_lib=`$PKG_CONFIG --libs 
glib-2.0`
   fi
 
+  AC_MSG_CHECKING([for libglib library])
   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}"],[
-      AC_MSG_CHECKING([for libglib library])
       libslist="${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
@@ -146,6 +142,7 @@
       done
     ])
   fi
+ AC_MSG_RESULT(${ac_cv_path_glib_lib})
 
 dnl
 dnl The problem with these macros is that ac_cv_path_package_lib
@@ -166,19 +163,9 @@
 fi
 
   if test x"${ac_cv_path_glib_incl}" != x; then
-    if test x"$pkg" = x"no"; then
-      libslist="${with_glib_lib} ${ac_cv_path_glib_incl}/../../lib 
${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib /usr/local/lib 
/home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
-      for i in $libslist; do
-        if test -f $i/glib-${gnash_glib_version}/include/glibconfig.h; then
-         ac_cv_path_glib_incl="${ac_cv_path_glib_incl} 
-I${i}/glib-${gnash_glib_version}/include"
-        break
-        fi
-      done
-    fi
     GLIB_CFLAGS="${ac_cv_path_glib_incl}"
   else
     GLIB_CFLAGS=""
-    AC_MSG_RESULT(no)
   fi
 
 

Index: macros/ogg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ogg.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/ogg.m4       10 Oct 2006 20:17:52 -0000      1.14
+++ macros/ogg.m4       10 Oct 2006 21:06:28 -0000      1.15
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: ogg.m4,v 1.14 2006/10/10 20:17:52 nihilus Exp $
+dnl $Id: ogg.m4,v 1.15 2006/10/10 21:06:28 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_OGG],
 [
@@ -93,7 +93,6 @@
  
     if test x"${ac_cv_path_ogg_incl}" != x ; then
       OGG_CFLAGS="${ac_cv_path_ogg_incl}"
-      AC_MSG_RESULT(${ac_cv_path_ogg_incl})
     else
       OGG_CFLAGS=""
     fi

Index: macros/glibmm.m4
===================================================================
RCS file: macros/glibmm.m4
diff -N macros/glibmm.m4
--- macros/glibmm.m4    24 Apr 2006 23:05:55 -0000      1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,82 +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 Linking Gnash statically or dynamically with other modules is making a
-dnl combined work based on Gnash. Thus, the terms and conditions of the GNU
-dnl General Public License cover the whole combination.
-dnl
-dnl As a special exception, the copyright holders of Gnash give you
-dnl permission to combine Gnash with free software programs or libraries
-dnl that are released under the GNU LGPL and with code included in any
-dnl release of Talkback distributed by the Mozilla Foundation. You may
-dnl copy and distribute such a system following the terms of the GNU GPL
-dnl for all but the LGPL-covered parts and Talkback, and following the
-dnl LGPL for the LGPL-covered parts.
-dnl
-dnl Note that people who make modified versions of Gnash are not obligated
-dnl to grant this special exception for their modified versions; it is their
-dnl choice whether to do so. The GNU General Public License gives permission
-dnl to release a modified version without this exception; this exception
-dnl also makes it possible to release a modified version which carries
-dnl forward this exception.
-dnl  
-dnl 
-
-AC_DEFUN([AM_PATH_GLIBMM],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(glibmm,[  --with-glibmm=PFX   Prefix where glibmm is installed 
(optional)], glibmm_prefix="$withval", glibmm_prefix="")
-AC_ARG_WITH(glibmm-libraries,[  --with-glibmm-libraries=DIR   Directory where 
glibmm library is installed (optional)], glibmm_libraries="$withval", 
glibmm_libraries="")
-AC_ARG_WITH(glibmm-includes,[  --with-glibmm-includes=DIR   Directory where 
glibmm header files are installed (optional)], glibmm_includes="$withval", 
glibmm_includes="")
-dnl AC_ARG_ENABLE(glibmmtest, [  --disable-glibmmtest       Do not try to 
compile and run a test glibmm program],, enable_glibmmtest=yes)
-
-  if test "x$glibmm_libraries" != "x" ; then
-    GLIBMM_LIBS="-L$glibmm_libraries"
-  elif test "x$glibmm_prefix" != "x" ; then
-    GLIBMM_LIBS="-L$glibmm_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    GLIBMM_LIBS="-L$libdir"
-  fi
-
-  if test "x$glibmm_includes" != "x" ; then
-    GLIBMM_CFLAGS="-I$glibmm_includes"
-  elif test "x$glibmm_prefix" != "x" ; then
-    GLIBMM_CFLAGS="-I$glibmm_prefix/include"
-  elif test "$prefix" != "xNONE"; then
-    GLIBMM_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for glibmm)
-  no_glibmm=""
-
-  if test "x$GLIBMM_CFLAGS" = "x" ; then
-    GLIBMM_CFLAGS=`pkg-config --cflags glibmm2`
-  fi
-
-  if test "x$GLIBMM_LIBS" = "x" ; then
-    GLIBMM_LIBS=`pkg-config --libs glibmm2`
-  fi
-
-  if test "x$GLIBMM_CFLAGS" != "x" -a  "x$GLIBMM_LIBS" != "x"; then
-    AC_MSG_RESULT(yes)
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  AC_SUBST(GLIBMM_CFLAGS)
-  AC_SUBST(GLIBMM_LIBS)
-])