openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File glib-1.2.10.dif of Package glib

--- acglib.m4
+++ acglib.m4
@@ -1,3 +1,10 @@
+AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
+[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
+	[ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
+		[AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+$1
+AC_DIVERT_POP()])])])
+
 dnl GLIB_IF_VAR_EQ (ENV_VAR, VALUE [, EQUALS_ACTION] [, ELSE_ACTION])
 AC_DEFUN(GLIB_IF_VAR_EQ,[
         case "$[$1]" in
--- configure.in
+++ configure.in
@@ -17,7 +17,7 @@
 
 dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
 dnl are available for $ac_help expansion (don't we all *love* autoconf?)
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+GLIB_AC_DIVERT_BEFORE_HELP([
 #
 # The following version number definitions apply to GLib, GModule and GThread
 # as a whole, so if changes occoured in any of them, they are all
@@ -37,8 +37,7 @@
 GLIB_INTERFACE_AGE=10
 GLIB_BINARY_AGE=10
 GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
-dnl
-AC_DIVERT_POP()dnl
+])dnl
 
 AC_SUBST(GLIB_MAJOR_VERSION)
 AC_SUBST(GLIB_MINOR_VERSION)
@@ -81,13 +80,13 @@
 
 dnl figure debugging default, prior to $ac_help setup
 dnl
-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
+GLIB_AC_DIVERT_BEFORE_HELP([
 if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then
 	debug_default=yes
 else
 	debug_default=minimum
 fi
-AC_DIVERT_POP()dnl
+])
 
 dnl declare --enable-* args and collect ac_help strings
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
@@ -405,13 +404,14 @@
 	  return realloc (0, sizeof (int)) == 0;
 	}],
 	glib_cv_sane_realloc=yes
-	AC_DEFINE(REALLOC_0_WORKS)
 	,
 	glib_cv_sane_realloc=no
 	,)
 ])
 AC_MSG_RESULT($glib_cv_sane_realloc)
-
+if test $glib_cv_sane_realloc = yes; then
+   AC_DEFINE(REALLOC_0_WORKS)
+fi
 
 dnl **********************
 dnl *** va_copy checks ***
@@ -507,9 +507,9 @@
 dnl *** dlopen() and dlsym() in system libraries
 if test -z "$G_MODULE_IMPL"; then
 	AC_CHECK_FUNC(dlopen,
-		AC_CHECK_FUNC(dlsym,
+		[AC_CHECK_FUNC(dlsym,
 			G_MODULE_IMPL=G_MODULE_IMPL_DL
-		,)
+		,)]
 	,)
 fi
 dnl *** dlopen() and dlsym() in libdl
--- glib.m4
+++ glib.m4
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl
--- ltconfig
+++ ltconfig
@@ -447,16 +447,16 @@
   host_alias=$host
 fi
 
+host_cpu=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
+host_vendor=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
+host_os=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
+
 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$host_os" in
 linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
+linux*) host_os=`echo $host_os | sed 's/^$linux$$.*$$/\1-gnu\2/'`
 esac
 
-host_cpu=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
-host_vendor=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
-host_os=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
-
 case "$host_os" in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some

Places

File glib-1.2.10.dif of Package glib

Places