|
 |
a813418 |
diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
|
|
|
a813418 |
--- ./gettext-runtime/libasprintf/configure.ac.rpathFix~ 2007-10-08 05:37:36.000000000 +1000
|
|
|
a813418 |
+++ ./gettext-runtime/libasprintf/configure.ac 2008-08-28 16:43:18.000000000 +1000
|
|
|
19de18f |
@@ -54,7 +54,8 @@ dnl Checks for header files.
|
|
|
19de18f |
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
|
19de18f |
AC_C_INLINE
|
|
|
19de18f |
AC_TYPE_SIZE_T
|
|
|
19de18f |
-gl_AC_TYPE_LONG_LONG
|
|
|
19de18f |
+AC_TYPE_LONG_LONG_INT
|
|
|
19de18f |
+#gl_AC_TYPE_LONG_LONG
|
|
|
19de18f |
gt_TYPE_LONGDOUBLE
|
|
|
19de18f |
gt_TYPE_WCHAR_T
|
|
|
19de18f |
gt_TYPE_WINT_T
|
|
|
a813418 |
diff -up ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~ ./gettext-tools/gnulib-tests/Makefile.gnulib
|
|
|
a813418 |
--- ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~ 2007-10-28 01:39:18.000000000 +1000
|
|
|
a813418 |
+++ ./gettext-tools/gnulib-tests/Makefile.gnulib 2008-08-28 16:43:18.000000000 +1000
|
|
|
a813418 |
@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I ../gnulib-m4
|
|
|
a813418 |
|
|
|
a813418 |
SUBDIRS =
|
|
|
a813418 |
TESTS =
|
|
|
a813418 |
-TESTS_ENVIRONMENT =
|
|
|
a813418 |
+TESTS_ENVIRONMENT = LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64'
|
|
|
a813418 |
noinst_PROGRAMS =
|
|
|
a813418 |
check_PROGRAMS =
|
|
|
a813418 |
noinst_HEADERS =
|
|
|
a813418 |
diff -up ./gettext-tools/src/Makefile.am.rpathFix~ ./gettext-tools/src/Makefile.am
|
|
|
a813418 |
--- ./gettext-tools/src/Makefile.am.rpathFix~ 2007-10-08 05:37:38.000000000 +1000
|
|
|
a813418 |
+++ ./gettext-tools/src/Makefile.am 2008-08-28 17:16:45.000000000 +1000
|
|
|
a813418 |
@@ -62,6 +62,7 @@ projectsdir = $(pkgdatadir)/projects
|
|
|
a813418 |
pkglibdir = $(libdir)/gettext
|
|
|
a813418 |
|
|
|
a813418 |
AM_CPPFLAGS = \
|
|
|
a813418 |
+ -I../../../../../../usr/include \
|
|
|
a813418 |
-I. -I$(srcdir) \
|
|
|
a813418 |
-I.. -I$(top_srcdir) \
|
|
|
a813418 |
-I$(top_srcdir)/libgrep \
|
|
|
a813418 |
@@ -82,7 +83,7 @@ LDADD = ../gnulib-lib/libgettextlib.la @
|
|
|
a813418 |
|
|
|
a813418 |
SED = sed
|
|
|
a813418 |
YACC = @YACC@ -d
|
|
|
a813418 |
-GCJ = @GCJ@
|
|
|
a813418 |
+GCJ = gcj
|
|
|
a813418 |
GCJFLAGS = @GCJFLAGS@
|
|
|
a813418 |
JAR = @JAR@
|
|
|
a813418 |
JAVACOMP = $(SHELL) ../javacomp.sh
|
|
|
a813418 |
diff -up ./gettext-tools/tests/Makefile.am.rpathFix~ ./gettext-tools/tests/Makefile.am
|
|
|
a813418 |
--- ./gettext-tools/tests/Makefile.am.rpathFix~ 2007-10-21 07:54:40.000000000 +1000
|
|
|
a813418 |
+++ ./gettext-tools/tests/Makefile.am 2008-08-28 16:43:18.000000000 +1000
|
|
|
19de18f |
@@ -181,6 +181,7 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_src
|
|
|
19de18f |
LOCALE_JA='@LOCALE_JA@' \
|
|
|
19de18f |
host_os='@host_os@' \
|
|
|
19de18f |
CONFIG_SHELL='$(SHELL)' \
|
|
|
a813418 |
+ LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64' \
|
|
|
19de18f |
$(SHELL)
|
|
|
19de18f |
|
|
|
19de18f |
xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c
|
|
|
a813418 |
diff -up ./m4/libtool.m4.rpathFix~ ./m4/libtool.m4
|
|
|
a813418 |
--- ./m4/libtool.m4.rpathFix~ 2007-10-27 10:46:10.000000000 +1000
|
|
|
a813418 |
+++ ./m4/libtool.m4 2008-08-28 16:43:18.000000000 +1000
|
|
|
19de18f |
@@ -1616,7 +1616,7 @@ linux* | k*bsd*-gnu)
|
|
|
19de18f |
# This implies no fast_install, which is unacceptable.
|
|
|
19de18f |
# Some rework will be needed to allow for fast_install
|
|
|
19de18f |
# before this can be enabled.
|
|
|
19de18f |
- hardcode_into_libs=yes
|
|
|
19de18f |
+ #hardcode_into_libs=yes
|
|
|
19de18f |
|
|
|
19de18f |
# Append ld.so.conf contents to the search path
|
|
|
19de18f |
if test -f /etc/ld.so.conf; then
|
|
|
19de18f |
@@ -2872,7 +2872,8 @@ if test "$GXX" = yes; then
|
|
|
19de18f |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
|
|
19de18f |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
|
|
|
19de18f |
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
|
|
19de18f |
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
19de18f |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
19de18f |
|
|
|
19de18f |
# If archive_cmds runs LD, not CC, wlarc should be empty
|
|
|
19de18f |
@@ -3340,7 +3341,8 @@ case $host_os in
|
|
|
19de18f |
# dependencies.
|
|
|
19de18f |
output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
|
|
|
19de18f |
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
|
|
|
19de18f |
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
19de18f |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
19de18f |
|
|
|
19de18f |
# Archives containing C++ object files must be created using
|
|
|
19de18f |
@@ -3368,7 +3370,8 @@ case $host_os in
|
|
|
19de18f |
;;
|
|
|
19de18f |
esac
|
|
|
19de18f |
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
|
|
19de18f |
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
19de18f |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
19de18f |
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
|
|
19de18f |
;;
|
|
|
19de18f |
@@ -3377,7 +3380,8 @@ case $host_os in
|
|
|
19de18f |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
|
|
19de18f |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
|
|
19de18f |
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
|
|
19de18f |
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
19de18f |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
19de18f |
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
|
|
|
19de18f |
;;
|
|
|
19de18f |
@@ -3387,7 +3391,8 @@ case $host_os in
|
|
|
19de18f |
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
|
|
|
19de18f |
|
|
|
19de18f |
runpath_var=LD_RUN_PATH
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
|
|
19de18f |
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
19de18f |
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
19de18f |
|
|
|
19de18f |
# Commands to make compiler produce verbose output that lists
|
|
|
19de18f |
@@ -3584,8 +3589,9 @@ case $host_os in
|
|
|
19de18f |
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
|
|
|
19de18f |
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
|
|
|
19de18f |
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
19de18f |
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
19de18f |
|
|
|
19de18f |
# Commands to make compiler produce verbose output that lists
|
|
|
19de18f |
# what "hidden" libraries, object files and flags are used when
|
|
|
19de18f |
@@ -5582,7 +5588,8 @@ ifelse([$1],[CXX],[
|
|
|
19de18f |
# are reset later if shared libraries are not supported. Putting them
|
|
|
19de18f |
# here allows them to be overridden if necessary.
|
|
|
19de18f |
runpath_var=LD_RUN_PATH
|
|
|
19de18f |
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
|
|
19de18f |
+# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
|
|
|
19de18f |
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
|
|
|
19de18f |
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
|
|
19de18f |
# ancient GNU ld didn't support --whole-archive et. al.
|
|
|
19de18f |
if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
|