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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/30 16:11:49

Modified files:
        .              : ChangeLog 
        macros         : glib.m4 

Log message:
        Fixed output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1443&r2=1.1444
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1443
retrieving revision 1.1444
diff -u -b -r1.1443 -r1.1444
--- ChangeLog   30 Oct 2006 16:01:21 -0000      1.1443
+++ ChangeLog   30 Oct 2006 16:11:48 -0000      1.1444
@@ -4,6 +4,7 @@
        * configure.ac: Removed 0.7.1 from the version info, let's stick with
          cvs+BUILDDATE.
        * macros/boost.m4: Applied patch from Bernhard Rosenkraenzer.
+       * macros/glib.m4: Fixed output.
 
 2006-10-30 Hannes Mayr <address@hidden>
        * server/asobj/NetStream.cpp: added <unistd.h> include for sleep()

Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- macros/glib.m4      29 Oct 2006 18:34:10 -0000      1.18
+++ macros/glib.m4      30 Oct 2006 16:11:48 -0000      1.19
@@ -17,7 +17,7 @@
 dnl  
 dnl 
 
-dnl $Id: glib.m4,v 1.18 2006/10/29 18:34:10 rsavoye Exp $
+dnl $Id: glib.m4,v 1.19 2006/10/30 16:11:48 nihilus Exp $
 
 AC_DEFUN([GNASH_PATH_GLIB],
 [
@@ -62,7 +62,7 @@
   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=""],[
@@ -83,6 +83,7 @@
       fi
     ])
   fi
+ AC_MSG_CHECKING([for libglib header])  
  AC_MSG_RESULT(${ac_cv_path_glib_incl})
  
   dnl Look for the library
@@ -102,7 +103,6 @@
     $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}"],[
       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 .. ../.."
@@ -124,6 +124,7 @@
       done
     ])
   fi
+ AC_MSG_CHECKING([for libglib library])
  AC_MSG_RESULT(${ac_cv_path_glib_lib})
  
 dnl