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
This commit is contained in:
Dan Winship
2001-11-27 17:31:12 +00:00
parent e409b5ae5e
commit 8049ab4876
12 changed files with 114 additions and 23 deletions

View File

@@ -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)