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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/26 00:55:46

Modified files:
        .              : ChangeLog 
        macros         : glib.m4 

Log message:
        * macros/glib.m4: fixed to allow for custom glib installations

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.522&r2=1.523
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -b -r1.522 -r1.523
--- ChangeLog   26 Jul 2006 00:21:39 -0000      1.522
+++ ChangeLog   26 Jul 2006 00:55:46 -0000      1.523
@@ -1,5 +1,6 @@
 2006-07-26 Sandro Santilli <address@hidden>
 
+       * macros/glib.m4: fixed to allow for custom glib installations
        * configure.ac, backend/Makefile.am: add --enable-sound option
          to select between SDL or GSTREAMER
        * backend/sound_handler_gst.cpp: don't use broken HAVE_GST_GST_H

Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- macros/glib.m4      24 May 2006 11:26:04 -0000      1.10
+++ macros/glib.m4      26 Jul 2006 00:55:46 -0000      1.11
@@ -41,10 +41,12 @@
   AC_ARG_WITH(glib_incl, [  --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/glib.h ; then
+      if test -f ${with_glib_incl}/glib.h ; then
        ac_cv_path_glib_incl=`(cd ${with_glib_incl}; pwd)`
+        gnash_glib_topdir=`basename $ac_cv_path_glib_incl`
+        gnash_glib_version=`echo ${gnash_glib_topdir} | sed -e 's:glib-::'`
       else
-       AC_MSG_ERROR([${with_glib_incl} directory doesn't contain glib/glib.h])
+       AC_MSG_ERROR([${with_glib_incl} directory doesn't contain glib.h])
       fi
     fi
   ])
@@ -52,7 +54,7 @@
   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"${ac_cv_path_glib_incl}" = x; then
+  if test x"${gnash_glib_version}" = x; then
     AC_MSG_CHECKING([for the Glib Version])
     pathlist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include /usr/pkg/include .. ../.."
 
@@ -67,7 +69,6 @@
         fi
       done
     done
-  fi
 
   if test x"${gnash_glib_topdir}" = x; then
     AC_MSG_RESULT(none)
@@ -75,6 +76,8 @@
     AC_MSG_RESULT([${gnash_glib_version}])
   fi
 
+  fi
+
   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=""],[
@@ -97,21 +100,6 @@
     ])
   fi
 
-  if test x"${ac_cv_path_glib_incl}" != x ; then
-    AC_MSG_RESULT(yes)
-    libslist="${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="-I${ac_cv_path_glib_incl} 
-I${i}/glib-${gnash_glib_version}/include"
-      break
-      fi
-    done
-    GLIB_CFLAGS="${ac_cv_path_glib_incl}"
-  else
-    GLIB_CFLAGS=""
-    AC_MSG_RESULT(no)
-  fi
-
   dnl Look for the library
   AC_ARG_WITH(glib_lib, [  --with-glib-lib         directory where glib 
library is], with_glib_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_glib_lib,[
@@ -129,7 +117,7 @@
   if test x"${ac_cv_path_glib_incl}" != 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="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib 
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+      libslist="${ac_cv_path_glib_lib} ${prefix}/lib64 ${prefix}/lib /usr/lib 
/usr/lib64 /sw/lib /usr/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
@@ -157,6 +145,22 @@
     fi
   fi
 
+  if test x"${ac_cv_path_glib_incl}" != x ; 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="-I${ac_cv_path_glib_incl} 
-I${i}/glib-${gnash_glib_version}/include"
+      break
+      fi
+    done
+    GLIB_CFLAGS="${ac_cv_path_glib_incl}"
+  else
+    GLIB_CFLAGS=""
+    AC_MSG_RESULT(no)
+  fi
+
+
+
   if test x"${ac_cv_path_glib_lib}" != x ; then
     GLIB_LIBS="${ac_cv_path_glib_lib}"
   else