Commit 83fbec4d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

[ merged from stable ]

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)
parent a7b7ff84
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> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * 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> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * 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> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * 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> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * 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> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * 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> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * 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> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string
......
...@@ -10,6 +10,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \ ...@@ -10,6 +10,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
EXTRA_DIST = \ EXTRA_DIST = \
ChangeLog.pre-2-0 \
ChangeLog.pre-1-2 \ ChangeLog.pre-1-2 \
glib.spec.in \ glib.spec.in \
glib-zip.in \ glib-zip.in \
......
...@@ -814,6 +814,13 @@ if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then ...@@ -814,6 +814,13 @@ if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then
G_MODULE_IMPL=G_MODULE_IMPL_BEOS], G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
[]) [])
fi 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 dnl *** dlopen() and dlsym() in libdl
if test -z "$G_MODULE_IMPL"; then if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dl, dlopen, AC_CHECK_LIB(dl, dlopen,
...@@ -822,13 +829,6 @@ if test -z "$G_MODULE_IMPL"; then ...@@ -822,13 +829,6 @@ if test -z "$G_MODULE_IMPL"; then
G_MODULE_IMPL=G_MODULE_IMPL_DL],[])], G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
[]) [])
fi 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) dnl *** shl_load() in libdld (HP-UX)
if test -z "$G_MODULE_IMPL"; then if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dld, shl_load, AC_CHECK_LIB(dld, shl_load,
......
...@@ -173,6 +173,8 @@ main () ...@@ -173,6 +173,8 @@ main ()
: :
else else
echo "*** Could not run GLIB test program, checking why..." echo "*** Could not run GLIB test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([ AC_TRY_LINK([
...@@ -189,9 +191,7 @@ main () ...@@ -189,9 +191,7 @@ main ()
echo "*** If you have an old version installed, it is best to remove it, although" 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 "*** 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 "*** 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 "*** exact error that occured. This usually means GLIB is 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" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment