[Gnash-commit] gnash/macros glib.m4 gtkglext.m4 [release_0_7_2]

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Markus Gothe <nihilus>  06/11/09 19:06:07

Modified files:
        macros         : glib.m4 gtkglext.m4 

Log message:
        More Fixes...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.4&r2=1.17.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.26.2.3&r2=1.26.2.4

Patches:
Index: glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -b -r1.17.2.4 -r1.17.2.5
--- glib.m4     9 Nov 2006 18:20:12 -0000       1.17.2.4
+++ glib.m4     9 Nov 2006 19:06:06 -0000       1.17.2.5
@@ -17,7 +17,7 @@
 dnl  
 dnl 
 
-dnl $Id: glib.m4,v 1.17.2.4 2006/11/09 18:20:12 nihilus Exp $
+dnl $Id: glib.m4,v 1.17.2.5 2006/11/09 19:06:06 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_GLIB],
 [
@@ -105,7 +105,6 @@
     fi
   ])
 
-  dnl Try with pkg-config
   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
@@ -134,48 +133,19 @@
  AC_MSG_CHECKING([for libglib library])
  AC_MSG_RESULT(${ac_cv_path_glib_lib})
  
-dnl
-dnl The problem with these macros is that ac_cv_path_package_lib
-dnl is ambiguos. Sometimes it refers to a directory, some other
-dnl times it refers to full LDFLAGS
-dnl
-
-if false; then
-dnl  else
-    if test -f $i/libglib-${gnash_glib_version}.a -o -f 
$i/libglib-${gnash_glib_version}.so; then
-      if test x"${ac_cv_path_glib_lib}" != x"/usr/lib"; then
-        ac_cv_path_glib_lib="-L${ac_cv_path_glib_lib} 
-lglib-${gnash_glib_version}"
-      else
-        ac_cv_path_glib_lib="-lglib-${gnash_glib_version}"
-      fi
-    fi
-dnl  fi
-fi
-
-  if test x"${ac_cv_path_glib_incl}" != x; then
-    libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib 
/usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64 /usr/lib /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/glib-${gnash_glib_version}/include/glibconfig.h; then
-        GLIB_CFLAGS="-I${i}/glib-${gnash_glib_version}/include"
-        break
-      fi
-    done
-    if test x"${ac_cv_path_glib_incl}" = x"yes"; then
-      GLIB_CFLAGS="$GLIB_CFLAGS"
-    else
+if test x"${ac_cv_path_glib_incl}" != x; then
       GLIB_CFLAGS="${ac_cv_path_glib_incl} $GLIB_CFLAGS"
-    fi
     AC_DEFINE([HAVE_GLIB], [1], [Has GLIB library installed])
-  else
+else
     GLIB_CFLAGS=""
-  fi
+fi
 
-  if test x"${ac_cv_path_glib_lib}" != x ; then
+if test x"${ac_cv_path_glib_lib}" != x ; then
     GLIB_LIBS="${ac_cv_path_glib_lib}"
-  else
+else
     GLIB_LIBS=""
-  fi
+fi
 
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
 ])

Index: gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -b -r1.26.2.3 -r1.26.2.4
--- gtkglext.m4 9 Nov 2006 18:20:12 -0000       1.26.2.3
+++ gtkglext.m4 9 Nov 2006 19:06:06 -0000       1.26.2.4
@@ -17,7 +17,7 @@
 dnl  
 dnl 
 
-dnl: $Id: gtkglext.m4,v 1.26.2.3 2006/11/09 18:20:12 nihilus Exp $
+dnl: $Id: gtkglext.m4,v 1.26.2.4 2006/11/09 19:06:06 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_GLEXT],
 [
@@ -151,6 +151,7 @@
        GLEXT_LIBS="${ac_cv_path_glext_lib}"
 else
        GLEXT_LIBS=""
+if
        
 AC_SUBST(GLEXT_CFLAGS)
 AC_SUBST(GLEXT_LIBS)