From 8049ab48764b9f0fa57112a7410b832b7cf02eff Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 27 Nov 2001 17:31:12 +0000 Subject: [PATCH] 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 --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-0 | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-12 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ configure.in | 22 +--------------------- glib/libcharset/config.charset | 3 +++ glib/libcharset/localcharset.c | 5 ++++- tests/Makefile.am | 3 ++- 12 files changed, 114 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7ad0a362..f784a835d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b7ad0a362..f784a835d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b7ad0a362..f784a835d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b7ad0a362..f784a835d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b7ad0a362..f784a835d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b7ad0a362..f784a835d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b7ad0a362..f784a835d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b7ad0a362..f784a835d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +2001-11-27 Dan Winship + + * 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 + 2001-11-26 Matthias Clasen * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. 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" diff --git a/glib/libcharset/config.charset b/glib/libcharset/config.charset index f4f2611c5..082fc6a21 100755 --- a/glib/libcharset/config.charset +++ b/glib/libcharset/config.charset @@ -435,4 +435,7 @@ case "$os" in echo "eo CP850" echo "eo_EO CP850" ;; + netbsd*) + echo "646 ASCII" + ;; esac diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c index acd88ed43..b428692f9 100644 --- a/glib/libcharset/localcharset.c +++ b/glib/libcharset/localcharset.c @@ -93,10 +93,13 @@ _g_locale_get_charset_aliases () { #ifndef WIN32 FILE *fp; - const char *dir = LIBDIR; + const char *dir = getenv ("LIBCHARSET_ALIAS_DIR"); const char *base = "charset.alias"; char *file_name; + if (dir == NULL) + dir = LIBDIR; + /* Concatenate dir and base into freshly allocated file_name. */ { size_t dir_len = strlen (dir); diff --git a/tests/Makefile.am b/tests/Makefile.am index bde732540..cc6539c60 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -93,7 +93,8 @@ test_script_support_programs = markup-test check_PROGRAMS = $(test_programs) $(test_script_support_programs) TESTS = $(test_programs) $(test_scripts) -TESTS_ENVIRONMENT = srcdir=$(srcdir) +TESTS_ENVIRONMENT = srcdir=$(srcdir) \ + LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset progs_LDADD = $(EFENCE) $(libglib) $(EFENCE) thread_LDADD = $(libgthread) @G_THREAD_LIBS@ $(progs_LDADD)