diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-05-06 16:07:03 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-05-06 16:07:03 +0000 |
| commit | 83fbec4d46e4bfa9e26733b74e92cfca90e62604 (patch) | |
| tree | bb985272a482d3680d4ea249cf1dc762c5678ccb /configure.in | |
| parent | a7b7ff8413192ed149afbd57d0e4430d33e76dd0 (diff) | |
| download | glib-83fbec4d46e4bfa9e26733b74e92cfca90e62604.tar.gz | |
[ 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)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 78aa75e5a..bc5787727 100644 --- a/configure.in +++ b/configure.in @@ -814,6 +814,13 @@ if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then 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, @@ -822,13 +829,6 @@ if test -z "$G_MODULE_IMPL"; then 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, |