luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set this from libtool rather than hardcoding values for certain platforms.

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

13
ChangeLog.pre-2-0
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

13
ChangeLog.pre-2-10
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

13
ChangeLog.pre-2-12
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

13
ChangeLog.pre-2-2
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

13
ChangeLog.pre-2-4
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

13
ChangeLog.pre-2-6
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

13
ChangeLog.pre-2-8
View File

@ -1,3 +1,16 @@
2001-11-27 Dan Winship <danw@ximian.com>
* 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 <matthiasc@poet.de> 2001-11-26 Matthias Clasen <matthiasc@poet.de>
* glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly. * glib/gnode.c (g_node_traverse): Implement G_LEVEL_ORDER correctly.

22
configure.in
View File

@ -765,7 +765,7 @@ dnl ***********************
G_MODULE_LIBS= G_MODULE_LIBS=
G_MODULE_LIBS_EXTRA= G_MODULE_LIBS_EXTRA=
G_MODULE_PLUGIN_LIBS= 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 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
G_MODULE_NEED_USCORE=0 G_MODULE_NEED_USCORE=0
G_MODULE_BROKEN_RTLD_GLOBAL=0 G_MODULE_BROKEN_RTLD_GLOBAL=0
@ -809,21 +809,6 @@ if test -z "$G_MODULE_IMPL"; then
fi 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_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, AC_CHECK_LIB(dld, shl_load,
[G_MODULE_LIBS=-ldld [G_MODULE_LIBS=-ldld
G_MODULE_IMPL=G_MODULE_IMPL_DLD], G_MODULE_IMPL=G_MODULE_IMPL_DLD],
@ -831,11 +816,6 @@ if test -z "$G_MODULE_IMPL"; then
fi fi
dnl *** additional checks for G_MODULE_IMPL_DL dnl *** additional checks for G_MODULE_IMPL_DL
if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then
case "$host_os" in
linux*)
G_MODULE_LDFLAGS='-rdynamic'
;;
esac
LIBS_orig="$LIBS" LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS" LDFLAGS_orig="$LDFLAGS"
LIBS="$LIBS $G_MODULE_LIBS" LIBS="$LIBS $G_MODULE_LIBS"

3
glib/libcharset/config.charset
View File

@ -435,4 +435,7 @@ case "$os" in
echo "eo CP850" echo "eo CP850"
echo "eo_EO CP850" echo "eo_EO CP850"
;; ;;
netbsd*)
echo "646 ASCII"
;;
esac esac

5
glib/libcharset/localcharset.c
View File

@ -93,10 +93,13 @@ _g_locale_get_charset_aliases ()
{ {
#ifndef WIN32 #ifndef WIN32
FILE *fp; FILE *fp;
const char *dir = LIBDIR; const char *dir = getenv ("LIBCHARSET_ALIAS_DIR");
const char *base = "charset.alias"; const char *base = "charset.alias";
char *file_name; char *file_name;
if (dir == NULL)
dir = LIBDIR;
/* Concatenate dir and base into freshly allocated file_name. */ /* Concatenate dir and base into freshly allocated file_name. */
{ {
size_t dir_len = strlen (dir); size_t dir_len = strlen (dir);

3
tests/Makefile.am
View File

@ -93,7 +93,8 @@ test_script_support_programs = markup-test
check_PROGRAMS = $(test_programs) $(test_script_support_programs) check_PROGRAMS = $(test_programs) $(test_script_support_programs)
TESTS = $(test_programs) $(test_scripts) 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) progs_LDADD = $(EFENCE) $(libglib) $(EFENCE)
thread_LDADD = $(libgthread) @G_THREAD_LIBS@ $(progs_LDADD) thread_LDADD = $(libgthread) @G_THREAD_LIBS@ $(progs_LDADD)