diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-11-27 17:31:12 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-11-27 17:31:12 +0000 |
| commit | 8049ab48764b9f0fa57112a7410b832b7cf02eff (patch) | |
| tree | c415e9c68ab1329bc45ea279f103dc40b7d7b09b /configure.in | |
| parent | e409b5ae5eb3b6cdfc7c85a2a587363eccccc8d1 (diff) | |
Set this from libtool rather than hardcoding values for certain platforms.
* configure.in (G_MODULE_LDFLAGS): Set this from libtool rather
than hardcoding values for certain platforms.
* glib/libcharset/config.charset: Add a rule for NetBSD.
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
If LIBCHARSET_ALIAS_DIR is set, look for charset.aliases there.
* tests/Makefile.am (TESTS_ENVIRONMENT): set LIBCHARSET_ALIAS_DIR
so we don't depend on charset.aliases having been installed
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/configure.in b/configure.in index 15e03ed8c..cb99f2608 100644 --- a/configure.in +++ b/configure.in @@ -765,7 +765,7 @@ dnl *********************** G_MODULE_LIBS= G_MODULE_LIBS_EXTRA= G_MODULE_PLUGIN_LIBS= -G_MODULE_LDFLAGS= +G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` dnl G_MODULE_IMPL= don't reset, so cmd-line can override G_MODULE_NEED_USCORE=0 G_MODULE_BROKEN_RTLD_GLOBAL=0 @@ -809,21 +809,6 @@ if test -z "$G_MODULE_IMPL"; then fi dnl *** shl_load() in libdld (HP-UX) if test -z "$G_MODULE_IMPL"; then - AC_MSG_CHECKING(how to export all symbols) - SAVED_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-E" - AC_TRY_LINK(,[ return 0; ], - [ G_MODULE_LDFLAGS="-Wl,-E" ],[ - LDFLAGS="$SAVED_LDFLAGS -bexpall" - AC_TRY_LINK(,[ return 0; ], - [G_MODULE_LDFLAGS="-bexpall"], - [G_MODULE_LDFLAGS="none"]) - ]) - LDFLAGS=$SAVED_LDFLAGS - AC_MSG_RESULT($G_MODULE_LDFLAGS) - if test "x$G_MODULE_LDFLAGS" = "xnone"; then - G_MODULE_LDFLAGS= - fi AC_CHECK_LIB(dld, shl_load, [G_MODULE_LIBS=-ldld G_MODULE_IMPL=G_MODULE_IMPL_DLD], @@ -831,11 +816,6 @@ if test -z "$G_MODULE_IMPL"; then fi dnl *** additional checks for G_MODULE_IMPL_DL if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then - case "$host_os" in - linux*) - G_MODULE_LDFLAGS='-rdynamic' - ;; - esac LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" LIBS="$LIBS $G_MODULE_LIBS" |