Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
+Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
+
+ [ merged from stable ]
+
+ * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+ * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
+ compiling "what went wrong" test case. (#79330)
+
+ * m4macros/glib-2.0.m4: Remove reference to editing
+ pkg-config script. (From Jim Gettys)
+
+ * configure.in: (Look for dyld interfaces before dlopen()
+ since OS X can have both. Patch from Jacob Berkman,
+ #80438)
+
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
+Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
+
+ [ merged from stable ]
+
+ * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+ * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
+ compiling "what went wrong" test case. (#79330)
+
+ * m4macros/glib-2.0.m4: Remove reference to editing
+ pkg-config script. (From Jim Gettys)
+
+ * configure.in: (Look for dyld interfaces before dlopen()
+ since OS X can have both. Patch from Jacob Berkman,
+ #80438)
+
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
+Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
+
+ [ merged from stable ]
+
+ * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+ * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
+ compiling "what went wrong" test case. (#79330)
+
+ * m4macros/glib-2.0.m4: Remove reference to editing
+ pkg-config script. (From Jim Gettys)
+
+ * configure.in: (Look for dyld interfaces before dlopen()
+ since OS X can have both. Patch from Jacob Berkman,
+ #80438)
+
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
+Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
+
+ [ merged from stable ]
+
+ * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+ * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
+ compiling "what went wrong" test case. (#79330)
+
+ * m4macros/glib-2.0.m4: Remove reference to editing
+ pkg-config script. (From Jim Gettys)
+
+ * configure.in: (Look for dyld interfaces before dlopen()
+ since OS X can have both. Patch from Jacob Berkman,
+ #80438)
+
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
+Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
+
+ [ merged from stable ]
+
+ * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+ * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
+ compiling "what went wrong" test case. (#79330)
+
+ * m4macros/glib-2.0.m4: Remove reference to editing
+ pkg-config script. (From Jim Gettys)
+
+ * configure.in: (Look for dyld interfaces before dlopen()
+ since OS X can have both. Patch from Jacob Berkman,
+ #80438)
+
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
+Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
+
+ [ merged from stable ]
+
+ * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+ * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
+ compiling "what went wrong" test case. (#79330)
+
+ * m4macros/glib-2.0.m4: Remove reference to editing
+ pkg-config script. (From Jim Gettys)
+
+ * configure.in: (Look for dyld interfaces before dlopen()
+ since OS X can have both. Patch from Jacob Berkman,
+ #80438)
+
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
+Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
+
+ [ merged from stable ]
+
+ * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
+
+ * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
+ compiling "what went wrong" test case. (#79330)
+
+ * m4macros/glib-2.0.m4: Remove reference to editing
+ pkg-config script. (From Jim Gettys)
+
+ * configure.in: (Look for dyld interfaces before dlopen()
+ since OS X can have both. Patch from Jacob Berkman,
+ #80438)
+
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string
-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
EXTRA_DIST = \
-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
EXTRA_DIST = \
ChangeLog.pre-1-2 \
glib.spec.in \
glib-zip.in \
ChangeLog.pre-1-2 \
glib.spec.in \
glib-zip.in \
G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
[])
fi
G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
[])
fi
+dnl *** NSLinkModule (dyld) in system libraries (Darwin)
+if test -z "$G_MODULE_IMPL"; then
+ AC_CHECK_FUNC(NSLinkModule,
+ [G_MODULE_IMPL=G_MODULE_IMPL_DYLD
+ G_MODULE_NEED_USCORE=1],
+ [])
+fi
dnl *** dlopen() and dlsym() in libdl
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dl, dlopen,
dnl *** dlopen() and dlsym() in libdl
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dl, dlopen,
G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
[])
fi
G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
[])
fi
-dnl *** NSLinkModule (dyld) in system libraries (Darwin)
-if test -z "$G_MODULE_IMPL"; then
- AC_CHECK_FUNC(NSLinkModule,
- [G_MODULE_IMPL=G_MODULE_IMPL_DYLD
- G_MODULE_NEED_USCORE=1],
- [])
-fi
dnl *** shl_load() in libdld (HP-UX)
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dld, shl_load,
dnl *** shl_load() in libdld (HP-UX)
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dld, shl_load,
:
else
echo "*** Could not run GLIB test program, checking why..."
:
else
echo "*** Could not run GLIB test program, checking why..."
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([
CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
- echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi