r14523 - /desktop/unstable/libgnomeuimm2.6/debian/patches/70_relibtoolize.patch
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Mon Feb 11 20:20:34 UTC 2008
Author: manphiz-guest
Date: Mon Feb 11 20:20:34 2008
New Revision: 14523
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14523
Log:
Regenerate 70_relibtoolize.patch, or it'll FTBFS...
Modified:
desktop/unstable/libgnomeuimm2.6/debian/patches/70_relibtoolize.patch
Modified: desktop/unstable/libgnomeuimm2.6/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeuimm2.6/debian/patches/70_relibtoolize.patch?rev=14523&op=diff
==============================================================================
--- desktop/unstable/libgnomeuimm2.6/debian/patches/70_relibtoolize.patch (original)
+++ desktop/unstable/libgnomeuimm2.6/debian/patches/70_relibtoolize.patch Mon Feb 11 20:20:34 2008
@@ -1,6 +1,6 @@
diff -urN libgnomeuimm-2.20.2.orig/aclocal.m4 libgnomeuimm-2.20.2/aclocal.m4
--- libgnomeuimm-2.20.2.orig/aclocal.m4 2008-02-11 00:31:07.000000000 +0800
-+++ libgnomeuimm-2.20.2/aclocal.m4 2008-02-11 02:24:22.000000000 +0800
++++ libgnomeuimm-2.20.2/aclocal.m4 2008-02-12 04:12:07.000000000 +0800
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -9545,7 +9545,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6003,1454 +5310,2410 @@
+@@ -6003,1454 +5310,2411 @@
# AIX 5 now supports IA64 processor
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -13241,10 +13241,10 @@
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
--m4_include([scripts/macros.m4])
+ m4_include([scripts/macros.m4])
diff -urN libgnomeuimm-2.20.2.orig/configure libgnomeuimm-2.20.2/configure
--- libgnomeuimm-2.20.2.orig/configure 2008-02-11 00:31:12.000000000 +0800
-+++ libgnomeuimm-2.20.2/configure 2008-02-11 02:24:44.000000000 +0800
++++ libgnomeuimm-2.20.2/configure 2008-02-12 04:12:33.000000000 +0800
@@ -857,12 +857,15 @@
host_cpu
host_vendor
@@ -13261,27 +13261,7 @@
CXX
CXXFLAGS
ac_ct_CXX
-@@ -874,7 +877,6 @@
- FFLAGS
- ac_ct_F77
- LIBTOOL
--M4
- LIBGNOMEUI_VERSION_NEEDED
- LIBGNOMEMM_VERSION_NEEDED
- LIBGNOMECANVASMM_VERSION_NEEDED
-@@ -2500,10 +2502,7 @@
- MAINT=$MAINTAINER_MODE_TRUE
-
-
--
-- test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-- for k in scripts ; do ACLOCAL="$ACLOCAL -I $k" ; done
--
-+AL_ACLOCAL_INCLUDE(scripts)
-
-
- #########################################################################
-@@ -4032,12 +4031,13 @@
+@@ -4032,12 +4035,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13296,7 +13276,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4072,6 +4072,7 @@
+@@ -4072,6 +4076,7 @@
fi
SED=$lt_cv_path_SED
@@ -13304,7 +13284,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -4433,8 +4434,8 @@
+@@ -4433,8 +4438,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -13315,7 +13295,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4453,7 +4454,7 @@
+@@ -4453,7 +4458,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -13324,7 +13304,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -4475,16 +4476,22 @@
+@@ -4475,16 +4480,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -13351,7 +13331,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -4522,7 +4529,7 @@
+@@ -4522,7 +4533,7 @@
esac
;;
@@ -13360,7 +13340,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -4538,11 +4545,11 @@
+@@ -4538,11 +4549,11 @@
;;
# This must be Linux ELF.
@@ -13374,7 +13354,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -4572,6 +4579,10 @@
+@@ -4572,6 +4583,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -13385,16 +13365,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -4659,7 +4670,7 @@
+@@ -4659,7 +4674,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4662 "configure"' > conftest.$ac_ext
-+ echo '#line 4673 "configure"' > conftest.$ac_ext
++ echo '#line 4677 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -4694,7 +4705,8 @@
+@@ -4694,7 +4709,8 @@
rm -rf conftest*
;;
@@ -13404,7 +13384,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -4705,6 +4717,9 @@
+@@ -4705,6 +4721,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -13414,7 +13394,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -4721,6 +4736,9 @@
+@@ -4721,6 +4740,9 @@
;;
*64-bit*)
case $host in
@@ -13424,7 +13404,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -4824,7 +4842,11 @@
+@@ -4824,7 +4846,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -13437,7 +13417,7 @@
esac
;;
esac
-@@ -6191,7 +6213,6 @@
+@@ -6191,7 +6217,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -13445,7 +13425,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -6278,24 +6299,27 @@
+@@ -6278,24 +6303,27 @@
fi
;;
*)
@@ -13490,7 +13470,7 @@
;;
esac
-@@ -6312,6 +6336,7 @@
+@@ -6312,6 +6340,7 @@
@@ -13498,7 +13478,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -6349,7 +6374,7 @@
+@@ -6349,7 +6378,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -13507,7 +13487,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -6502,7 +6527,7 @@
+@@ -6502,7 +6531,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -13516,7 +13496,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -6900,7 +6925,7 @@
+@@ -6900,7 +6929,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -13525,7 +13505,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -7062,6 +7087,318 @@
+@@ -7062,6 +7091,318 @@
;;
esac
@@ -13844,7 +13824,7 @@
enable_dlopen=no
enable_win32_dll=no
-@@ -7100,10 +7437,10 @@
+@@ -7100,10 +7441,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -13857,7 +13837,7 @@
# If no C compiler was specified, use CC.
-@@ -7118,16 +7455,16 @@
+@@ -7118,16 +7459,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -13877,7 +13857,7 @@
-@@ -7144,7 +7481,7 @@
+@@ -7144,7 +7485,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -13886,21 +13866,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7155,11 +7492,11 @@
+@@ -7155,11 +7496,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7158: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7495: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7499: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7162: \$? = $ac_status" >&5
-+ echo "$as_me:7499: \$? = $ac_status" >&5
++ echo "$as_me:7503: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -7210,13 +7547,15 @@
+@@ -7210,13 +7551,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -13918,7 +13898,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -7226,7 +7565,7 @@
+@@ -7226,7 +7569,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -13927,7 +13907,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -7284,7 +7623,7 @@
+@@ -7284,7 +7627,7 @@
esac
;;
@@ -13936,7 +13916,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -7317,7 +7656,7 @@
+@@ -7317,7 +7660,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -13945,7 +13925,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -7336,6 +7675,22 @@
+@@ -7336,6 +7679,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -13968,7 +13948,7 @@
esac
;;
-@@ -7345,6 +7700,10 @@
+@@ -7345,6 +7704,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -13979,7 +13959,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -7407,12 +7766,12 @@
+@@ -7407,12 +7770,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -13995,17 +13975,17 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7423,27 +7782,27 @@
+@@ -7423,27 +7786,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7426: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7785: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7789: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7430: \$? = $ac_status" >&5
-+ echo "$as_me:7789: \$? = $ac_status" >&5
++ echo "$as_me:7793: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14029,7 +14009,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -7470,13 +7829,13 @@
+@@ -7470,13 +7833,13 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -14046,7 +14026,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -7486,20 +7845,20 @@
+@@ -7486,20 +7849,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -14073,7 +14053,7 @@
:
else
lt_prog_compiler_static=
-@@ -7516,7 +7875,7 @@
+@@ -7516,7 +7879,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -14082,21 +14062,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -7527,11 +7886,11 @@
+@@ -7527,11 +7890,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7530: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7889: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7893: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7534: \$? = $ac_status" >&5
-+ echo "$as_me:7893: \$? = $ac_status" >&5
++ echo "$as_me:7897: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -7611,12 +7970,13 @@
+@@ -7611,12 +7974,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -14111,7 +14091,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -7675,7 +8035,7 @@
+@@ -7675,7 +8039,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -14120,7 +14100,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -7723,7 +8083,7 @@
+@@ -7723,7 +8087,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -14129,7 +14109,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -7741,7 +8101,7 @@
+@@ -7741,7 +8105,7 @@
fi
;;
@@ -14138,7 +14118,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -7756,7 +8116,7 @@
+@@ -7756,7 +8120,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -14147,7 +14127,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -7774,20 +8134,30 @@
+@@ -7774,20 +8138,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -14181,7 +14161,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -7885,7 +8255,7 @@
+@@ -7885,7 +8259,7 @@
fi
;;
@@ -14190,7 +14170,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -7905,7 +8275,7 @@
+@@ -7905,7 +8279,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -14199,7 +14179,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -7939,7 +8309,7 @@
+@@ -7939,7 +8313,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -14208,7 +14188,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -8013,11 +8383,18 @@
+@@ -8013,11 +8387,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -14231,7 +14211,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8072,11 +8449,18 @@
+@@ -8072,11 +8453,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -14254,7 +14234,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8130,7 +8514,7 @@
+@@ -8130,7 +8518,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -14263,7 +14243,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -8163,19 +8547,18 @@
+@@ -8163,19 +8551,18 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -14289,7 +14269,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -8215,7 +8598,7 @@
+@@ -8215,7 +8602,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -14298,7 +14278,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -8317,7 +8700,7 @@
+@@ -8317,7 +8704,7 @@
link_all_deplibs=yes
;;
@@ -14307,7 +14287,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -8337,24 +8720,28 @@
+@@ -8337,24 +8724,28 @@
;;
openbsd*)
@@ -14353,7 +14333,7 @@
fi
;;
-@@ -8413,17 +8800,16 @@
+@@ -8413,17 +8804,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -14380,7 +14360,7 @@
esac
link_all_deplibs=yes
;;
-@@ -8480,7 +8866,7 @@
+@@ -8480,7 +8870,7 @@
fi
;;
@@ -14389,7 +14369,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -8557,7 +8943,7 @@
+@@ -8557,7 +8947,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -14398,7 +14378,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -8615,17 +9001,55 @@
+@@ -8615,17 +9005,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -14458,7 +14438,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -8646,7 +9070,7 @@
+@@ -8646,7 +9074,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -14467,7 +14447,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8785,12 +9209,8 @@
+@@ -8785,12 +9213,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -14482,7 +14462,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -8807,18 +9227,6 @@
+@@ -8807,18 +9231,6 @@
dynamic_linker=no
;;
@@ -14501,7 +14481,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -8856,7 +9264,7 @@
+@@ -8856,7 +9268,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -14510,7 +14490,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -8919,7 +9327,7 @@
+@@ -8919,7 +9331,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -14519,7 +14499,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8974,7 +9382,7 @@
+@@ -8974,7 +9386,7 @@
;;
# This must be Linux ELF.
@@ -14528,7 +14508,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8988,31 +9396,10 @@
+@@ -8988,31 +9400,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -14562,7 +14542,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -9024,7 +9411,7 @@
+@@ -9024,7 +9415,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -14571,7 +14551,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9033,7 +9420,7 @@
+@@ -9033,7 +9424,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -14580,7 +14560,7 @@
;;
netbsd*)
-@@ -9117,6 +9504,10 @@
+@@ -9117,6 +9508,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -14591,7 +14571,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -9213,6 +9604,21 @@
+@@ -9213,6 +9608,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -14613,7 +14593,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -9270,6 +9676,7 @@
+@@ -9270,6 +9680,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -14621,7 +14601,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -9531,7 +9938,7 @@
+@@ -9531,7 +9942,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -14630,7 +14610,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -9807,7 +10214,7 @@
+@@ -9807,7 +10218,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -14639,25 +14619,25 @@
fi
-@@ -9856,7 +10263,7 @@
+@@ -9856,7 +10267,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9859 "configure"
-+#line 10266 "configure"
++#line 10270 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9956,7 +10363,7 @@
+@@ -9956,7 +10367,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9959 "configure"
-+#line 10366 "configure"
++#line 10370 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10083,7 +10490,7 @@
+@@ -10083,7 +10494,7 @@
fi
;;
@@ -14666,7 +14646,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -10139,6 +10546,7 @@
+@@ -10139,6 +10550,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -14674,7 +14654,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -10154,6 +10562,7 @@
+@@ -10154,6 +10566,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -14682,7 +14662,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -10198,7 +10607,7 @@
+@@ -10198,7 +10611,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -14691,7 +14671,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -10434,6 +10843,10 @@
+@@ -10434,6 +10847,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -14702,7 +14682,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -10522,7 +10935,7 @@
+@@ -10522,7 +10939,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -14711,7 +14691,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -10682,6 +11095,7 @@
+@@ -10682,6 +11099,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -14719,7 +14699,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -10691,10 +11105,10 @@
+@@ -10691,10 +11109,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -14732,7 +14712,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -10710,16 +11124,16 @@
+@@ -10710,16 +11128,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -14752,7 +14732,7 @@
# Allow CC to be a program name with arguments.
-@@ -10926,7 +11340,7 @@
+@@ -10926,7 +11344,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -14761,7 +14741,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -10939,7 +11353,7 @@
+@@ -10939,7 +11357,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -14770,7 +14750,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -10975,7 +11389,7 @@
+@@ -10975,7 +11393,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -14779,7 +14759,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -11049,11 +11463,18 @@
+@@ -11049,11 +11467,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -14802,7 +14782,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11109,11 +11530,18 @@
+@@ -11109,11 +11534,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -14825,7 +14805,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11183,59 +11611,31 @@
+@@ -11183,59 +11615,31 @@
fi
;;
darwin* | rhapsody*)
@@ -14896,7 +14876,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -11269,7 +11669,7 @@
+@@ -11269,7 +11673,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -14905,7 +14885,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -11318,9 +11718,7 @@
+@@ -11318,9 +11722,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -14916,7 +14896,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -11388,7 +11786,7 @@
+@@ -11388,7 +11790,7 @@
;;
esac
;;
@@ -14925,7 +14905,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -11428,7 +11826,7 @@
+@@ -11428,7 +11830,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -14934,7 +14914,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -11480,7 +11878,7 @@
+@@ -11480,7 +11882,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -14943,7 +14923,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$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'
-@@ -11508,6 +11906,29 @@
+@@ -11508,6 +11910,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -14973,7 +14953,7 @@
esac
;;
lynxos*)
-@@ -11530,7 +11951,7 @@
+@@ -11530,7 +11955,7 @@
;;
esac
;;
@@ -14982,7 +14962,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -11546,16 +11967,20 @@
+@@ -11546,16 +11971,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -15012,7 +14992,7 @@
;;
osf3*)
case $cc_basename in
-@@ -11717,15 +12142,10 @@
+@@ -11717,15 +12146,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -15031,7 +15011,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -11772,6 +12192,12 @@
+@@ -11772,6 +12196,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -15044,7 +15024,7 @@
fi
;;
esac
-@@ -11859,7 +12285,6 @@
+@@ -11859,7 +12289,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -15052,7 +15032,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -11961,9 +12386,14 @@
+@@ -11961,9 +12390,14 @@
$rm -f confest.$objext
@@ -15068,7 +15048,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -11971,19 +12401,51 @@
+@@ -11971,19 +12405,51 @@
postdeps_CXX=
;;
@@ -15122,7 +15102,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -12014,12 +12476,14 @@
+@@ -12014,12 +12480,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -15139,7 +15119,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -12031,7 +12495,7 @@
+@@ -12031,7 +12499,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -15148,7 +15128,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -12057,7 +12521,7 @@
+@@ -12057,7 +12525,7 @@
esac
else
case $host_os in
@@ -15157,7 +15137,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -12097,7 +12561,7 @@
+@@ -12097,7 +12565,7 @@
;;
esac
;;
@@ -15166,7 +15146,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -12140,7 +12604,7 @@
+@@ -12140,7 +12608,7 @@
;;
esac
;;
@@ -15175,7 +15155,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -12153,7 +12617,7 @@
+@@ -12153,7 +12621,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -15184,7 +15164,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -12167,6 +12631,14 @@
+@@ -12167,6 +12635,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -15199,7 +15179,7 @@
;;
esac
;;
-@@ -12183,7 +12655,7 @@
+@@ -12183,7 +12659,7 @@
;;
esac
;;
@@ -15208,7 +15188,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -12276,12 +12748,12 @@
+@@ -12276,12 +12752,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -15224,17 +15204,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -12292,27 +12764,27 @@
+@@ -12292,27 +12768,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12295: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12767: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12771: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12299: \$? = $ac_status" >&5
-+ echo "$as_me:12771: \$? = $ac_status" >&5
++ echo "$as_me:12775: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15258,7 +15238,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -12339,13 +12811,13 @@
+@@ -12339,13 +12815,13 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -15275,7 +15255,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -12355,20 +12827,20 @@
+@@ -12355,20 +12831,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -15302,7 +15282,7 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -12385,7 +12857,7 @@
+@@ -12385,7 +12861,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -15311,21 +15291,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -12396,11 +12868,11 @@
+@@ -12396,11 +12872,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12399: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12871: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12875: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12403: \$? = $ac_status" >&5
-+ echo "$as_me:12875: \$? = $ac_status" >&5
++ echo "$as_me:12879: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -12453,7 +12925,7 @@
+@@ -12453,7 +12929,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -15334,7 +15314,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -12466,12 +12938,16 @@
+@@ -12466,12 +12942,16 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -15352,7 +15332,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -12497,7 +12973,7 @@
+@@ -12497,7 +12977,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -15361,7 +15341,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -12555,20 +13031,7 @@
+@@ -12555,20 +13035,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15383,7 +15363,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -12586,7 +13049,7 @@
+@@ -12586,7 +13053,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -15392,7 +15372,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12725,12 +13188,7 @@
+@@ -12725,12 +13192,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -15406,38 +15386,26 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -12738,25 +13196,13 @@
- version_type=linux
- need_lib_prefix=no
- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--freebsd1*)
-- dynamic_linker=no
-- ;;
--
+@@ -12747,18 +13209,6 @@
+ dynamic_linker=no
+ ;;
+
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
- ;;
-
+- ;;
+-
freebsd* | dragonfly*)
-@@ -12796,7 +13242,7 @@
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -12796,7 +13246,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -15446,7 +15414,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -12859,7 +13305,7 @@
+@@ -12859,7 +13309,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -15455,7 +15423,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12914,7 +13360,7 @@
+@@ -12914,7 +13364,7 @@
;;
# This must be Linux ELF.
@@ -15464,7 +15432,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12928,31 +13374,10 @@
+@@ -12928,31 +13378,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -15498,7 +15466,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12964,7 +13389,7 @@
+@@ -12964,7 +13393,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -15507,7 +15475,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12973,7 +13398,7 @@
+@@ -12973,7 +13402,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -15516,7 +15484,7 @@
;;
netbsd*)
-@@ -13057,6 +13482,10 @@
+@@ -13057,6 +13486,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -15527,7 +15495,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -13153,6 +13582,21 @@
+@@ -13153,6 +13586,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -15549,7 +15517,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -13236,6 +13680,7 @@
+@@ -13236,6 +13684,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -15557,7 +15525,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -13251,6 +13696,7 @@
+@@ -13251,6 +13700,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -15565,7 +15533,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -13483,6 +13929,10 @@
+@@ -13483,6 +13933,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -15576,7 +15544,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -13571,7 +14021,7 @@
+@@ -13571,7 +14025,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -15585,7 +15553,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -13662,10 +14112,17 @@
+@@ -13662,10 +14116,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -15605,7 +15573,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -13681,16 +14138,16 @@
+@@ -13681,16 +14142,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -15625,7 +15593,7 @@
# Allow CC to be a program name with arguments.
-@@ -13728,7 +14185,7 @@
+@@ -13728,7 +14189,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -15634,7 +15602,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -13774,13 +14231,15 @@
+@@ -13774,13 +14235,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -15652,7 +15620,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -13790,7 +14249,7 @@
+@@ -13790,7 +14253,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -15661,7 +15629,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -13848,7 +14307,7 @@
+@@ -13848,7 +14311,7 @@
esac
;;
@@ -15670,7 +15638,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -13881,7 +14340,7 @@
+@@ -13881,7 +14344,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -15679,7 +15647,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -13900,6 +14359,22 @@
+@@ -13900,6 +14363,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -15702,7 +15670,7 @@
esac
;;
-@@ -13909,6 +14384,10 @@
+@@ -13909,6 +14388,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -15713,7 +15681,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -13971,12 +14450,12 @@
+@@ -13971,12 +14454,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -15729,17 +15697,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13987,27 +14466,27 @@
+@@ -13987,27 +14470,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13990: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14469: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14473: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13994: \$? = $ac_status" >&5
-+ echo "$as_me:14473: \$? = $ac_status" >&5
++ echo "$as_me:14477: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15763,7 +15731,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14034,13 +14513,13 @@
+@@ -14034,13 +14517,13 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -15780,7 +15748,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14050,20 +14529,20 @@
+@@ -14050,20 +14533,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -15807,7 +15775,7 @@
:
else
lt_prog_compiler_static_F77=
-@@ -14080,7 +14559,7 @@
+@@ -14080,7 +14563,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -15816,21 +15784,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14091,11 +14570,11 @@
+@@ -14091,11 +14574,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14094: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14573: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14577: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14098: \$? = $ac_status" >&5
-+ echo "$as_me:14577: \$? = $ac_status" >&5
++ echo "$as_me:14581: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14175,12 +14654,13 @@
+@@ -14175,12 +14658,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -15845,7 +15813,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -14239,7 +14719,7 @@
+@@ -14239,7 +14723,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -15854,7 +15822,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -14287,7 +14767,7 @@
+@@ -14287,7 +14771,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -15863,7 +15831,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -14305,7 +14785,7 @@
+@@ -14305,7 +14789,7 @@
fi
;;
@@ -15872,7 +15840,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -14320,7 +14800,7 @@
+@@ -14320,7 +14804,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -15881,7 +15849,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -14338,20 +14818,30 @@
+@@ -14338,20 +14822,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -15915,7 +15883,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -14449,7 +14939,7 @@
+@@ -14449,7 +14943,7 @@
fi
;;
@@ -15924,7 +15892,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -14469,7 +14959,7 @@
+@@ -14469,7 +14963,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -15933,7 +15901,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -14503,7 +14993,7 @@
+@@ -14503,7 +14997,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -15942,7 +15910,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -14567,11 +15057,18 @@
+@@ -14567,11 +15061,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -15965,7 +15933,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -14616,11 +15113,18 @@
+@@ -14616,11 +15117,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -15988,7 +15956,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -14674,7 +15178,7 @@
+@@ -14674,7 +15182,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -15997,7 +15965,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -14707,19 +15211,18 @@
+@@ -14707,19 +15215,18 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -16023,7 +15991,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -14759,7 +15262,7 @@
+@@ -14759,7 +15266,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16032,7 +16000,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -14861,7 +15364,7 @@
+@@ -14861,7 +15368,7 @@
link_all_deplibs_F77=yes
;;
@@ -16041,7 +16009,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -14881,24 +15384,28 @@
+@@ -14881,24 +15388,28 @@
;;
openbsd*)
@@ -16087,7 +16055,7 @@
fi
;;
-@@ -14957,17 +15464,16 @@
+@@ -14957,17 +15468,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -16114,7 +16082,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -15024,7 +15530,7 @@
+@@ -15024,7 +15534,7 @@
fi
;;
@@ -16123,7 +16091,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -15101,7 +15607,7 @@
+@@ -15101,7 +15611,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -16132,7 +16100,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -15159,20 +15665,7 @@
+@@ -15159,20 +15669,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16154,7 +16122,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -15190,7 +15683,7 @@
+@@ -15190,7 +15687,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -16163,7 +16131,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15329,12 +15822,7 @@
+@@ -15329,12 +15826,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16177,7 +16145,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -15351,18 +15839,6 @@
+@@ -15351,18 +15843,6 @@
dynamic_linker=no
;;
@@ -16196,7 +16164,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -15400,7 +15876,7 @@
+@@ -15400,7 +15880,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -16205,7 +16173,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -15463,7 +15939,7 @@
+@@ -15463,7 +15943,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16214,7 +16182,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15518,7 +15994,7 @@
+@@ -15518,7 +15998,7 @@
;;
# This must be Linux ELF.
@@ -16223,7 +16191,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15532,31 +16008,10 @@
+@@ -15532,31 +16012,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -16257,7 +16225,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15568,7 +16023,7 @@
+@@ -15568,7 +16027,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -16266,7 +16234,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15577,7 +16032,7 @@
+@@ -15577,7 +16036,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -16275,7 +16243,7 @@
;;
netbsd*)
-@@ -15661,6 +16116,10 @@
+@@ -15661,6 +16120,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -16286,7 +16254,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -15757,6 +16216,21 @@
+@@ -15757,6 +16220,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -16308,7 +16276,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -15840,6 +16314,7 @@
+@@ -15840,6 +16318,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -16316,7 +16284,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -15855,6 +16330,7 @@
+@@ -15855,6 +16334,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -16324,7 +16292,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -16087,6 +16563,10 @@
+@@ -16087,6 +16567,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -16335,7 +16303,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -16175,7 +16655,7 @@
+@@ -16175,7 +16659,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -16344,7 +16312,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -16233,10 +16713,10 @@
+@@ -16233,10 +16717,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -16357,7 +16325,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -16252,16 +16732,16 @@
+@@ -16252,16 +16736,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -16377,7 +16345,7 @@
# Allow CC to be a program name with arguments.
-@@ -16299,7 +16779,7 @@
+@@ -16299,7 +16783,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -16386,21 +16354,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16310,11 +16790,11 @@
+@@ -16310,11 +16794,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16313: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16793: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16797: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16317: \$? = $ac_status" >&5
-+ echo "$as_me:16797: \$? = $ac_status" >&5
++ echo "$as_me:16801: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -16365,14 +16845,16 @@
+@@ -16365,14 +16849,16 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -16420,7 +16388,7 @@
;;
darwin* | rhapsody*)
-@@ -16381,7 +16863,7 @@
+@@ -16381,7 +16867,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -16429,7 +16397,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -16439,10 +16921,10 @@
+@@ -16439,10 +16925,10 @@
esac
;;
@@ -16442,7 +16410,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -16472,7 +16954,7 @@
+@@ -16472,7 +16958,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -16451,7 +16419,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16491,6 +16973,22 @@
+@@ -16491,6 +16977,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -16474,7 +16442,7 @@
esac
;;
-@@ -16500,6 +16998,10 @@
+@@ -16500,6 +17002,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -16485,7 +16453,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16562,12 +17064,12 @@
+@@ -16562,12 +17068,12 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -16501,17 +16469,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16578,27 +17080,27 @@
+@@ -16578,27 +17084,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16581: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17083: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17087: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16585: \$? = $ac_status" >&5
-+ echo "$as_me:17087: \$? = $ac_status" >&5
++ echo "$as_me:17091: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16535,7 +16503,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -16625,13 +17127,13 @@
+@@ -16625,13 +17131,13 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -16552,7 +16520,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16641,20 +17143,20 @@
+@@ -16641,20 +17147,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -16579,7 +16547,7 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -16671,7 +17173,7 @@
+@@ -16671,7 +17177,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -16588,21 +16556,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -16682,11 +17184,11 @@
+@@ -16682,11 +17188,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16685: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17187: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17191: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16689: \$? = $ac_status" >&5
-+ echo "$as_me:17191: \$? = $ac_status" >&5
++ echo "$as_me:17195: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16766,12 +17268,13 @@
+@@ -16766,12 +17272,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -16617,7 +16585,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -16830,7 +17333,7 @@
+@@ -16830,7 +17337,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -16626,7 +16594,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -16878,7 +17381,7 @@
+@@ -16878,7 +17385,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -16635,7 +16603,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -16896,7 +17399,7 @@
+@@ -16896,7 +17403,7 @@
fi
;;
@@ -16644,7 +16612,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -16911,7 +17414,7 @@
+@@ -16911,7 +17418,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -16653,7 +16621,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16929,20 +17432,30 @@
+@@ -16929,20 +17436,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -16687,7 +16655,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -17040,7 +17553,7 @@
+@@ -17040,7 +17557,7 @@
fi
;;
@@ -16696,7 +16664,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -17060,7 +17573,7 @@
+@@ -17060,7 +17577,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -16705,7 +16673,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -17094,7 +17607,7 @@
+@@ -17094,7 +17611,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -16714,7 +16682,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -17168,11 +17681,18 @@
+@@ -17168,11 +17685,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -16737,7 +16705,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17227,11 +17747,18 @@
+@@ -17227,11 +17751,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -16760,7 +16728,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17285,7 +17812,7 @@
+@@ -17285,7 +17816,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -16769,7 +16737,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -17318,19 +17845,18 @@
+@@ -17318,19 +17849,18 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -16795,7 +16763,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -17370,7 +17896,7 @@
+@@ -17370,7 +17900,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16804,7 +16772,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -17472,7 +17998,7 @@
+@@ -17472,7 +18002,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -16813,7 +16781,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17492,24 +18018,28 @@
+@@ -17492,24 +18022,28 @@
;;
openbsd*)
@@ -16859,7 +16827,7 @@
fi
;;
-@@ -17568,17 +18098,16 @@
+@@ -17568,17 +18102,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -16886,7 +16854,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -17635,7 +18164,7 @@
+@@ -17635,7 +18168,7 @@
fi
;;
@@ -16895,7 +16863,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -17712,7 +18241,7 @@
+@@ -17712,7 +18245,7 @@
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -16904,7 +16872,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -17770,20 +18299,7 @@
+@@ -17770,20 +18303,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16926,7 +16894,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17801,7 +18317,7 @@
+@@ -17801,7 +18321,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -16935,7 +16903,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17940,12 +18456,7 @@
+@@ -17940,12 +18460,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16949,7 +16917,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17962,18 +18473,6 @@
+@@ -17962,18 +18477,6 @@
dynamic_linker=no
;;
@@ -16968,7 +16936,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -18011,7 +18510,7 @@
+@@ -18011,7 +18514,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -16977,7 +16945,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -18074,7 +18573,7 @@
+@@ -18074,7 +18577,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -16986,7 +16954,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18129,7 +18628,7 @@
+@@ -18129,7 +18632,7 @@
;;
# This must be Linux ELF.
@@ -16995,7 +16963,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18143,31 +18642,10 @@
+@@ -18143,31 +18646,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -17029,7 +16997,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18179,7 +18657,7 @@
+@@ -18179,7 +18661,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -17038,7 +17006,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18188,7 +18666,7 @@
+@@ -18188,7 +18670,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -17047,7 +17015,7 @@
;;
netbsd*)
-@@ -18272,6 +18750,10 @@
+@@ -18272,6 +18754,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -17058,7 +17026,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -18368,6 +18850,21 @@
+@@ -18368,6 +18854,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -17080,7 +17048,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -18451,6 +18948,7 @@
+@@ -18451,6 +18952,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -17088,7 +17056,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -18466,6 +18964,7 @@
+@@ -18466,6 +18968,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -17096,7 +17064,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -18698,6 +19197,10 @@
+@@ -18698,6 +19201,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -17107,7 +17075,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -18786,7 +19289,7 @@
+@@ -18786,7 +19293,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -17116,7 +17084,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -18843,7 +19346,7 @@
+@@ -18843,7 +19350,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -17125,7 +17093,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -18862,16 +19365,16 @@
+@@ -18862,16 +19369,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -17145,7 +17113,7 @@
# Allow CC to be a program name with arguments.
-@@ -18931,6 +19434,7 @@
+@@ -18931,6 +19438,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -17153,7 +17121,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -18946,6 +19450,7 @@
+@@ -18946,6 +19454,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -17161,7 +17129,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -19178,6 +19683,10 @@
+@@ -19178,6 +19687,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -17172,7 +17140,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -19266,7 +19775,7 @@
+@@ -19266,7 +19779,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -17181,101 +17149,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -19366,89 +19875,17 @@
-
-
-
--
--for ac_prog in gm4 m4
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_M4+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$M4"; then
-- ac_cv_prog_M4="$M4" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_M4="$ac_prog"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--M4=$ac_cv_prog_M4
--if test -n "$M4"; then
-- { echo "$as_me:$LINENO: result: $M4" >&5
--echo "${ECHO_T}$M4" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--
--
-- test -n "$M4" && break
--done
--test -n "$M4" || M4="m4"
--
--
--if test "$M4" = "m4"; then
-- { echo "$as_me:$LINENO: checking whether m4 is GNU m4" >&5
--echo $ECHO_N "checking whether m4 is GNU m4... $ECHO_C" >&6; }
-- if $M4 --version </dev/null 2>/dev/null | grep '^GNU m4 ' >/dev/null ; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- if test "$host_vendor" = "sun"; then
-- { { echo "$as_me:$LINENO: error: SUN m4 does not work for building gtkmm.
-+AL_PROG_GNU_M4({ { echo "$as_me:$LINENO: error: SUN m4 does not work for building gtkmm.
- Please install GNU m4." >&5
- echo "$as_me: error: SUN m4 does not work for building gtkmm.
- Please install GNU m4." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- fi
--fi
-+ { (exit 1); exit 1; }; })
-
--
--
--{ echo "$as_me:$LINENO: checking whether make is GNU Make" >&5
--echo $ECHO_N "checking whether make is GNU Make... $ECHO_C" >&6; }
--if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- if test "$host_vendor" = "sun" ; then
-- { { echo "$as_me:$LINENO: error: SUN make does not work for building gtkmm.
-+AL_PROG_GNU_MAKE({ { echo "$as_me:$LINENO: error: SUN make does not work for building gtkmm.
- Please install GNU make." >&5
- echo "$as_me: error: SUN make does not work for building gtkmm.
- Please install GNU make." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--fi
--
-+ { (exit 1); exit 1; }; })
-
- #########################################################################
- # Dependancy checks
-@@ -19692,7 +20129,7 @@
+@@ -19692,7 +20205,7 @@
and LIBGNOMEUIMM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17284,7 +17158,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -19702,7 +20139,7 @@
+@@ -19702,7 +20215,7 @@
and LIBGNOMEUIMM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -17293,7 +17167,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21044,13 +21481,13 @@
+@@ -21044,13 +21557,13 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -17308,7 +17182,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -21092,6 +21529,9 @@
+@@ -21092,6 +21605,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -17318,24 +17192,16 @@
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
CXXDEPMODE!$CXXDEPMODE$ac_delim
-@@ -21102,7 +21542,6 @@
- FFLAGS!$FFLAGS$ac_delim
- ac_ct_F77!$ac_ct_F77$ac_delim
- LIBTOOL!$LIBTOOL$ac_delim
--M4!$M4$ac_delim
- LIBGNOMEUI_VERSION_NEEDED!$LIBGNOMEUI_VERSION_NEEDED$ac_delim
- LIBGNOMEMM_VERSION_NEEDED!$LIBGNOMEMM_VERSION_NEEDED$ac_delim
- LIBGNOMECANVASMM_VERSION_NEEDED!$LIBGNOMECANVASMM_VERSION_NEEDED$ac_delim
-@@ -21123,7 +21562,7 @@
+@@ -21123,7 +21639,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -21524,21 +21963,22 @@
+@@ -21524,21 +22040,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -17365,7 +17231,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -21575,7 +22015,7 @@
+@@ -21575,7 +22092,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
@@ -17376,7 +17242,7 @@
X"$mf" : 'X\(//\)[^/]' \| \
diff -urN libgnomeuimm-2.20.2.orig/demos/Makefile.in libgnomeuimm-2.20.2/demos/Makefile.in
--- libgnomeuimm-2.20.2.orig/demos/Makefile.in 2008-02-11 00:31:09.000000000 +0800
-+++ libgnomeuimm-2.20.2/demos/Makefile.in 2008-02-11 02:24:39.000000000 +0800
++++ libgnomeuimm-2.20.2/demos/Makefile.in 2008-02-12 04:12:30.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17388,17 +17254,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -34,8 +34,7 @@
- subdir = demos
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -64,6 +63,7 @@
+@@ -64,6 +64,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17406,11 +17262,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -99,10 +99,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -103,6 +104,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17418,7 +17270,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -113,6 +113,7 @@
+@@ -113,6 +115,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17428,7 +17280,7 @@
STRIP = @STRIP@
diff -urN libgnomeuimm-2.20.2.orig/docs/Makefile.in libgnomeuimm-2.20.2/docs/Makefile.in
--- libgnomeuimm-2.20.2.orig/docs/Makefile.in 2008-02-11 00:31:09.000000000 +0800
-+++ libgnomeuimm-2.20.2/docs/Makefile.in 2008-02-11 02:24:39.000000000 +0800
++++ libgnomeuimm-2.20.2/docs/Makefile.in 2008-02-12 04:12:30.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17440,17 +17292,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -34,8 +34,7 @@
- subdir = docs
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -75,6 +74,7 @@
+@@ -75,6 +75,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17458,11 +17300,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -110,10 +110,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -114,6 +115,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17470,7 +17308,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -124,6 +124,7 @@
+@@ -124,6 +126,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17478,7 +17316,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -295,8 +296,8 @@
+@@ -295,8 +298,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17489,7 +17327,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -321,8 +322,8 @@
+@@ -321,8 +324,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17500,7 +17338,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -332,13 +333,12 @@
+@@ -332,13 +335,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -17518,7 +17356,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/docs/reference/Makefile.in libgnomeuimm-2.20.2/docs/reference/Makefile.in
--- libgnomeuimm-2.20.2.orig/docs/reference/Makefile.in 2008-02-11 00:31:09.000000000 +0800
-+++ libgnomeuimm-2.20.2/docs/reference/Makefile.in 2008-02-11 02:24:39.000000000 +0800
++++ libgnomeuimm-2.20.2/docs/reference/Makefile.in 2008-02-12 04:12:30.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17530,17 +17368,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -35,8 +35,7 @@
- DIST_COMMON = README $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -65,6 +64,7 @@
+@@ -65,6 +65,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17548,11 +17376,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -100,10 +100,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -104,6 +105,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17560,7 +17384,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -114,6 +114,7 @@
+@@ -114,6 +116,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17570,7 +17394,7 @@
STRIP = @STRIP@
diff -urN libgnomeuimm-2.20.2.orig/examples/druid/Makefile.in libgnomeuimm-2.20.2/examples/druid/Makefile.in
--- libgnomeuimm-2.20.2.orig/examples/druid/Makefile.in 2008-02-11 00:31:09.000000000 +0800
-+++ libgnomeuimm-2.20.2/examples/druid/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/examples/druid/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17582,17 +17406,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,8 +37,7 @@
- noinst_PROGRAMS = druid$(EXEEXT)
- subdir = examples/druid
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -94,6 +93,7 @@
+@@ -94,6 +94,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17600,11 +17414,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -129,10 +129,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -133,6 +134,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17612,7 +17422,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -143,6 +143,7 @@
+@@ -143,6 +145,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17620,7 +17430,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -289,8 +290,8 @@
+@@ -289,8 +292,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17631,7 +17441,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -302,8 +303,8 @@
+@@ -302,8 +305,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17642,7 +17452,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -313,13 +314,12 @@
+@@ -313,13 +316,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -17660,7 +17470,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/examples/gnome-hello/Makefile.in libgnomeuimm-2.20.2/examples/gnome-hello/Makefile.in
--- libgnomeuimm-2.20.2.orig/examples/gnome-hello/Makefile.in 2008-02-11 00:31:09.000000000 +0800
-+++ libgnomeuimm-2.20.2/examples/gnome-hello/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/examples/gnome-hello/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17672,17 +17482,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,8 +37,7 @@
- noinst_PROGRAMS = gnome-hello$(EXEEXT)
- subdir = examples/gnome-hello
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -93,6 +92,7 @@
+@@ -93,6 +93,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17690,11 +17490,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -128,10 +128,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -132,6 +133,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17702,7 +17498,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -142,6 +142,7 @@
+@@ -142,6 +144,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17710,7 +17506,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -288,8 +289,8 @@
+@@ -288,8 +291,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17721,7 +17517,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -301,8 +302,8 @@
+@@ -301,8 +304,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17732,7 +17528,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -312,13 +313,12 @@
+@@ -312,13 +315,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -17750,7 +17546,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/examples/iconlist/Makefile.in libgnomeuimm-2.20.2/examples/iconlist/Makefile.in
--- libgnomeuimm-2.20.2.orig/examples/iconlist/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/examples/iconlist/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/examples/iconlist/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17762,17 +17558,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,8 +37,7 @@
- noinst_PROGRAMS = iconlist$(EXEEXT) iconlist2$(EXEEXT)
- subdir = examples/iconlist
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -87,6 +86,7 @@
+@@ -87,6 +87,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17780,11 +17566,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -122,10 +122,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -126,6 +127,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17792,7 +17574,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -136,6 +136,7 @@
+@@ -136,6 +138,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17800,7 +17582,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -286,8 +287,8 @@
+@@ -286,8 +289,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17811,7 +17593,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -299,8 +300,8 @@
+@@ -299,8 +302,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17822,7 +17604,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -310,13 +311,12 @@
+@@ -310,13 +313,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -17840,7 +17622,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/examples/Makefile.in libgnomeuimm-2.20.2/examples/Makefile.in
--- libgnomeuimm-2.20.2.orig/examples/Makefile.in 2008-02-11 00:31:09.000000000 +0800
-+++ libgnomeuimm-2.20.2/examples/Makefile.in 2008-02-11 02:24:39.000000000 +0800
++++ libgnomeuimm-2.20.2/examples/Makefile.in 2008-02-12 04:12:30.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17852,17 +17634,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -34,8 +34,7 @@
- subdir = examples
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -76,6 +75,7 @@
+@@ -76,6 +76,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17870,11 +17642,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -111,10 +111,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -115,6 +116,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17882,7 +17650,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -125,6 +125,7 @@
+@@ -125,6 +127,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17890,7 +17658,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -296,8 +297,8 @@
+@@ -296,8 +299,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17901,7 +17669,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -322,8 +323,8 @@
+@@ -322,8 +325,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17912,7 +17680,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -333,13 +334,12 @@
+@@ -333,13 +336,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -17930,7 +17698,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/examples/menu/Makefile.in libgnomeuimm-2.20.2/examples/menu/Makefile.in
--- libgnomeuimm-2.20.2.orig/examples/menu/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/examples/menu/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/examples/menu/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -17942,17 +17710,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,8 +37,7 @@
- noinst_PROGRAMS = menuapp$(EXEEXT)
- subdir = examples/menu
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -93,6 +92,7 @@
+@@ -93,6 +93,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -17960,11 +17718,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -128,10 +128,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -132,6 +133,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -17972,7 +17726,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -142,6 +142,7 @@
+@@ -142,6 +144,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -17980,7 +17734,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -287,8 +288,8 @@
+@@ -287,8 +290,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -17991,7 +17745,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -300,8 +301,8 @@
+@@ -300,8 +303,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18002,7 +17756,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -311,13 +312,12 @@
+@@ -311,13 +314,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18020,7 +17774,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/examples/uiinfo/Makefile.in libgnomeuimm-2.20.2/examples/uiinfo/Makefile.in
--- libgnomeuimm-2.20.2.orig/examples/uiinfo/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/examples/uiinfo/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/examples/uiinfo/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18032,17 +17786,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -38,8 +38,7 @@
- popup$(EXEEXT)
- subdir = examples/uiinfo
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -96,6 +95,7 @@
+@@ -96,6 +96,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -18050,11 +17794,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -131,10 +131,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -135,6 +136,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -18062,7 +17802,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -145,6 +145,7 @@
+@@ -145,6 +147,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -18070,7 +17810,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -304,8 +305,8 @@
+@@ -304,8 +307,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18081,7 +17821,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -317,8 +318,8 @@
+@@ -317,8 +320,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18092,7 +17832,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -328,13 +329,12 @@
+@@ -328,13 +331,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18110,7 +17850,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/libgnomeui/libgnomeuimm/Makefile.in libgnomeuimm-2.20.2/libgnomeui/libgnomeuimm/Makefile.in
--- libgnomeuimm-2.20.2.orig/libgnomeui/libgnomeuimm/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/libgnomeui/libgnomeuimm/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/libgnomeui/libgnomeuimm/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18122,17 +17862,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -44,8 +44,7 @@
- $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
- subdir = libgnomeui/libgnomeuimm
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -124,6 +123,7 @@
+@@ -124,6 +124,7 @@
DEFS = @DEFS@ -DG_LOG_DOMAIN=\"$(sublib_name)\"
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -18140,11 +17870,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -159,10 +159,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -163,6 +164,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -18152,7 +17878,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -173,6 +173,7 @@
+@@ -173,6 +175,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -18160,7 +17886,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -305,8 +306,8 @@
+@@ -305,8 +308,8 @@
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
@@ -18171,7 +17897,7 @@
else :; fi; \
done
-@@ -314,8 +315,8 @@
+@@ -314,8 +317,8 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
@@ -18182,7 +17908,7 @@
done
clean-libLTLIBRARIES:
-@@ -484,8 +485,8 @@
+@@ -484,8 +487,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18193,7 +17919,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -510,8 +511,8 @@
+@@ -510,8 +513,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18204,7 +17930,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -521,13 +522,12 @@
+@@ -521,13 +524,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18222,7 +17948,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/libgnomeui/libgnomeuimm/private/Makefile.in libgnomeuimm-2.20.2/libgnomeui/libgnomeuimm/private/Makefile.in
--- libgnomeuimm-2.20.2.orig/libgnomeui/libgnomeuimm/private/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/libgnomeui/libgnomeuimm/private/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/libgnomeui/libgnomeuimm/private/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18234,17 +17960,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -41,8 +41,7 @@
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- subdir = libgnomeui/libgnomeuimm/private
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -82,6 +81,7 @@
+@@ -82,6 +82,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -18252,11 +17968,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -117,10 +117,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -121,6 +122,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -18264,7 +17976,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -131,6 +131,7 @@
+@@ -131,6 +133,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -18272,7 +17984,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -255,8 +256,8 @@
+@@ -255,8 +258,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18283,7 +17995,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -268,8 +269,8 @@
+@@ -268,8 +271,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18294,7 +18006,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -279,13 +280,12 @@
+@@ -279,13 +282,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18312,7 +18024,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/libgnomeui/Makefile.in libgnomeuimm-2.20.2/libgnomeui/Makefile.in
--- libgnomeuimm-2.20.2.orig/libgnomeui/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/libgnomeui/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/libgnomeui/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18324,17 +18036,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -40,8 +40,7 @@
- $(srcdir)/libgnomeuimm-2.6.pc.in \
- $(srcdir)/libgnomeuimmconfig.h.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -97,6 +96,7 @@
+@@ -97,6 +97,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -18342,11 +18044,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -132,10 +132,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -136,6 +137,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -18354,7 +18052,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -146,6 +146,7 @@
+@@ -146,6 +148,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -18362,7 +18060,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -399,8 +400,8 @@
+@@ -399,8 +402,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18373,7 +18071,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -425,8 +426,8 @@
+@@ -425,8 +428,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18384,7 +18082,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -436,13 +437,12 @@
+@@ -436,13 +439,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) libgnomeuimmconfig.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18402,7 +18100,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/libgnomeui/src/Makefile.in libgnomeuimm-2.20.2/libgnomeui/src/Makefile.in
--- libgnomeuimm-2.20.2.orig/libgnomeui/src/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/libgnomeui/src/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/libgnomeui/src/Makefile.in 2008-02-12 04:12:31.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18414,17 +18112,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -42,8 +42,7 @@
- $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment
- subdir = libgnomeui/src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -72,6 +71,7 @@
+@@ -72,6 +72,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -18432,11 +18120,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -107,10 +107,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -111,6 +112,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -18444,7 +18128,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -121,6 +121,7 @@
+@@ -121,6 +123,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -18454,7 +18138,7 @@
STRIP = @STRIP@
diff -urN libgnomeuimm-2.20.2.orig/Makefile.in libgnomeuimm-2.20.2/Makefile.in
--- libgnomeuimm-2.20.2.orig/Makefile.in 2008-02-11 00:31:09.000000000 +0800
-+++ libgnomeuimm-2.20.2/Makefile.in 2008-02-11 02:24:39.000000000 +0800
++++ libgnomeuimm-2.20.2/Makefile.in 2008-02-12 04:12:30.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -18466,17 +18150,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,8 +37,7 @@
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- TODO
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -90,6 +89,7 @@
+@@ -90,6 +90,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -18484,11 +18158,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -125,10 +125,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -129,6 +130,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -18496,7 +18166,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -139,6 +139,7 @@
+@@ -139,6 +141,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -18504,7 +18174,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -324,8 +325,8 @@
+@@ -324,8 +327,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18515,7 +18185,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -350,8 +351,8 @@
+@@ -350,8 +353,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18526,7 +18196,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -361,13 +362,12 @@
+@@ -361,13 +364,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -18542,7 +18212,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-@@ -441,6 +441,10 @@
+@@ -441,6 +443,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
@@ -18553,7 +18223,7 @@
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
-@@ -467,6 +471,8 @@
+@@ -467,6 +473,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
@@ -18562,7 +18232,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
-@@ -618,8 +624,8 @@
+@@ -618,8 +626,8 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am all-local am--refresh check check-am clean \
clean-generic clean-libtool ctags ctags-recursive dist \
@@ -18573,1096 +18243,9 @@
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
-diff -urN libgnomeuimm-2.20.2.orig/scripts/config.guess libgnomeuimm-2.20.2/scripts/config.guess
---- libgnomeuimm-2.20.2.orig/scripts/config.guess 2008-02-06 05:13:52.000000000 +0800
-+++ libgnomeuimm-2.20.2/scripts/config.guess 2007-08-17 11:14:13.000000000 +0800
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2005-12-13'
-+timestamp='2007-07-22'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -106,7 +107,7 @@
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -160,6 +161,7 @@
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-+ sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -206,8 +208,11 @@
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit ;;
-+ *:SolidBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+ exit ;;
- macppc:MirBSD:*:*)
-- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- exit ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -325,7 +330,7 @@
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:*)
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
-@@ -764,12 +769,19 @@
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ case ${UNAME_MACHINE} in
-+ pc98)
-+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ *)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-- i*:MINGW*:*)
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
- i*:windows32*:*)
-@@ -779,9 +791,15 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[345]*)
-- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-- exit ;;
-+ *:Interix*:[3456]*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ EM64T | authenticamd)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-@@ -817,6 +835,9 @@
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit ;;
-@@ -851,7 +872,11 @@
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
-@@ -870,7 +895,11 @@
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-@@ -925,6 +954,9 @@
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit ;;
-+ xtensa:Linux:*:*)
-+ echo xtensa-unknown-linux-gnu
-+ exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us. cd to the root directory to prevent
-@@ -967,7 +999,7 @@
- LIBC=gnulibc1
- # endif
- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI)
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- LIBC=gnu
- #else
- LIBC=gnuaout
-@@ -977,7 +1009,11 @@
- LIBC=dietlibc
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^LIBC/{
-+ s: ::g
-+ p
-+ }'`"
- test x"${LIBC}" != x && {
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit
-@@ -1179,6 +1215,15 @@
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
-+ SX-7:SUPER-UX:*:*)
-+ echo sx7-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8:SUPER-UX:*:*)
-+ echo sx8-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8R:SUPER-UX:*:*)
-+ echo sx8r-nec-superux${UNAME_RELEASE}
-+ exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
-diff -urN libgnomeuimm-2.20.2.orig/scripts/config.sub libgnomeuimm-2.20.2/scripts/config.sub
---- libgnomeuimm-2.20.2.orig/scripts/config.sub 2008-02-06 05:13:53.000000000 +0800
-+++ libgnomeuimm-2.20.2/scripts/config.sub 2007-08-17 11:14:13.000000000 +0800
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-
--timestamp='2005-12-11'
-+timestamp='2007-06-28'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -240,15 +241,16 @@
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | bfin \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
-- | fr30 | frv \
-+ | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore | mep \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -268,26 +270,25 @@
- | mn10200 | mn10300 \
- | mt \
- | msp430 \
-+ | nios | nios2 \
- | ns16k | ns32k \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | score \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
-- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-- | sparcv8 | sparcv9 | sparcv9b \
-- | strongarm \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-- m32c)
-- basic_machine=$basic_machine-unknown
-- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
-@@ -317,18 +318,18 @@
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-- | avr-* \
-+ | avr-* | avr32-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-- | m32r-* | m32rle-* \
-+ | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -350,29 +351,28 @@
- | mmix-* \
- | mt-* \
- | msp430-* \
-+ | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-- m32c-*)
-- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 386bsd)
-@@ -475,8 +475,8 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16c)
-- basic_machine=cr16c-unknown
-+ cr16)
-+ basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
-@@ -683,6 +683,10 @@
- basic_machine=i386-pc
- os=-mingw32
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -818,6 +822,12 @@
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-+ pc98)
-+ basic_machine=i386-pc
-+ ;;
-+ pc98-*)
-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-@@ -904,6 +914,10 @@
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sde)
-+ basic_machine=mipsisa32-sde
-+ os=-elf
-+ ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
-@@ -915,6 +929,9 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh5el)
-+ basic_machine=sh5le-unknown
-+ ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
-@@ -1120,7 +1137,7 @@
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
-- sparc | sparcv8 | sparcv9 | sparcv9b)
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- basic_machine=sparc-sun
- ;;
- cydra)
-@@ -1193,7 +1210,8 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+ | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-@@ -1208,7 +1226,7 @@
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-- | -skyos* | -haiku* | -rdos*)
-+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1360,6 +1378,12 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ score-*)
-+ os=-elf
-+ ;;
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1369,9 +1393,9 @@
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
-@@ -1397,6 +1421,9 @@
- m68*-cisco)
- os=-aout
- ;;
-+ mep-*)
-+ os=-elf
-+ ;;
- mips*-cisco)
- os=-elf
- ;;
-diff -urN libgnomeuimm-2.20.2.orig/scripts/ltmain.sh libgnomeuimm-2.20.2/scripts/ltmain.sh
---- libgnomeuimm-2.20.2.orig/scripts/ltmain.sh 2008-02-06 05:13:53.000000000 +0800
-+++ libgnomeuimm-2.20.2/scripts/ltmain.sh 2008-02-02 21:28:24.000000000 +0800
-@@ -1,8 +1,8 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007, 2008 Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -43,14 +43,22 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.22
--TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.26 Debian 1.5.26-1"
-+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-
--# See if we are running on zsh, and set the options which allow our
--# commands through without removal of \ escapes.
--if test -n "${ZSH_VERSION+set}" ; then
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-@@ -105,11 +113,19 @@
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
- # We save the old values to restore during execute mode.
--if test "${LC_ALL+set}" = set; then
-- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
--fi
--if test "${LANG+set}" = set; then
-- save_LANG="$LANG"; LANG=C; export LANG
-+lt_env=
-+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+do
-+ eval "if test \"\${$lt_var+set}\" = set; then
-+ save_$lt_var=\$$lt_var
-+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"
-+ $lt_var=C
-+ export $lt_var
-+ fi"
-+done
-+
-+if test -n "$lt_env"; then
-+ lt_env="env $lt_env"
- fi
-
- # Make sure IFS has a sensible default
-@@ -136,6 +152,8 @@
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
-
- #####################################
- # Shell function definitions:
-@@ -196,7 +214,13 @@
- if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
- $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
- win32_nmres=`eval $NM -f posix -A $1 | \
-- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-+ $SED -n -e '1,100{
-+ / I /{
-+ s,.*,import,
-+ p
-+ q
-+ }
-+ }'`
- case $win32_nmres in
- import*) win32_libid_type="x86 archive import";;
- *) win32_libid_type="x86 archive static";;
-@@ -327,7 +351,17 @@
- *) my_xabs=`pwd`"/$my_xlib" ;;
- esac
- my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-- my_xdir="$my_gentop/$my_xlib"
-+ my_xlib_u=$my_xlib
-+ while :; do
-+ case " $extracted_archives " in
-+ *" $my_xlib_u "*)
-+ extracted_serial=`expr $extracted_serial + 1`
-+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
-+ *) break ;;
-+ esac
-+ done
-+ extracted_archives="$extracted_archives $my_xlib_u"
-+ my_xdir="$my_gentop/$my_xlib_u"
-
- $show "${rm}r $my_xdir"
- $run ${rm}r "$my_xdir"
-@@ -454,11 +488,12 @@
- ;;
-
- --version)
-- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-- $echo
-- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
-- $echo "This is free software; see the source for copying conditions. There is NO"
-- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+ echo "\
-+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-+
-+Copyright (C) 2008 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit $?
- ;;
-
-@@ -755,9 +790,11 @@
- *.class) xform=class ;;
- *.cpp) xform=cpp ;;
- *.cxx) xform=cxx ;;
-- *.f90) xform=f90 ;;
-+ *.[fF][09]?) xform=[fF][09]. ;;
- *.for) xform=for ;;
- *.java) xform=java ;;
-+ *.obj) xform=obj ;;
-+ *.sx) xform=sx ;;
- esac
-
- libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -926,7 +963,7 @@
- $run $rm "$lobj" "$output_obj"
-
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- test -n "$output_obj" && $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -998,7 +1035,7 @@
- command="$command$suppress_output"
- $run $rm "$obj" "$output_obj"
- $show "$command"
-- if $run eval "$command"; then :
-+ if $run eval $lt_env "$command"; then :
- else
- $run $rm $removelist
- exit $EXIT_FAILURE
-@@ -1131,6 +1168,7 @@
- thread_safe=no
- vinfo=
- vinfo_number=no
-+ single_module="${wl}-single_module"
-
- func_infer_tag $base_compile
-
-@@ -1138,8 +1176,9 @@
- for arg
- do
- case $arg in
-- -all-static | -static)
-- if test "X$arg" = "X-all-static"; then
-+ -all-static | -static | -static-libtool-libs)
-+ case $arg in
-+ -all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
- fi
-@@ -1147,12 +1186,20 @@
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=yes
-- else
-+ ;;
-+ -static)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
- fi
- prefer_static_libs=built
-- fi
-+ ;;
-+ -static-libtool-libs)
-+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
-+ dlopen_self=$dlopen_self_static
-+ fi
-+ prefer_static_libs=yes
-+ ;;
-+ esac
- build_libtool_libs=no
- build_old_libs=yes
- break
-@@ -1600,13 +1647,18 @@
- continue
- ;;
-
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
- continue
- ;;
-
-+ -multi_module)
-+ single_module="${wl}-multi_module"
-+ continue
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -1620,10 +1672,11 @@
- # -m* pass through architecture-specific compiler args for GCC
- # -m*, -t[45]*, -txscale* pass through architecture-specific
- # compiler args for GCC
-- # -pg pass through profiling flag for GCC
-+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+ # -F/path gives path to uninstalled frameworks, gcc on darwin
- # @file GCC response files
-- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1704,9 @@
-
- -no-install)
- case $host in
-- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
- # The PATH hackery in wrapper scripts is required on Windows
-- # in order for the loader to find any dlls it needs.
-+ # and Darwin in order for the loader to find any dlls it needs.
- $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
- $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
- fast_install=no
-@@ -1712,7 +1765,7 @@
- continue
- ;;
-
-- -static)
-+ -static | -static-libtool-libs)
- # The effects of -static are defined in a previous loop.
- # We used to do the same as -all-static on platforms that
- # didn't have a PIC flag, but the assumption that the effects
-@@ -2082,7 +2135,10 @@
- case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
-- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+ link)
-+ libs="$deplibs %DEPLIBS%"
-+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+ ;;
- esac
- fi
- if test "$pass" = dlopen; then
-@@ -2094,7 +2150,7 @@
- lib=
- found=no
- case $deplib in
-- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2109,7 +2165,12 @@
- continue
- fi
- name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+ if test "$linkmode" = lib; then
-+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-+ else
-+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-+ fi
-+ for searchdir in $searchdirs; do
- for search_ext in .la $std_shrext .so .a; do
- # Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
-@@ -2490,7 +2551,9 @@
-
- if test "$linkmode,$pass" = "prog,link"; then
- if test -n "$library_names" &&
-- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-+ { { test "$prefer_static_libs" = no ||
-+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
-+ test -z "$old_library"; }; then
- # We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
- # Make sure the rpath contains only unique directories.
-@@ -2903,12 +2966,18 @@
- # we do not want to link against static libs,
- # but need to link against shared
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+ eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- done
-- if test -f "$path/$depdepl" ; then
-+ if test -f "$deplibdir/$depdepl" ; then
-+ depdepl="$deplibdir/$depdepl"
-+ elif test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
-+ else
-+ # Can't find it, oh well...
-+ depdepl=
- fi
- # do not add paths which are already there
- case " $newlib_search_path " in
-@@ -3056,9 +3125,10 @@
-
- case $linkmode in
- oldlib)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-@@ -3186,7 +3256,7 @@
- # which has an extra 1 added just for fun
- #
- case $version_type in
-- darwin|linux|osf|windows)
-+ darwin|linux|osf|windows|none)
- current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_revision"
-@@ -3197,9 +3267,15 @@
- age="0"
- ;;
- irix|nonstopux)
-- current=`expr $number_major + $number_minor - 1`
-+ current=`expr $number_major + $number_minor`
- age="$number_minor"
- revision="$number_minor"
-+ lt_irix_increment=no
-+ ;;
-+ *)
-+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
-+ exit $EXIT_FAILURE
- ;;
- esac
- ;;
-@@ -3258,7 +3334,8 @@
- versuffix="$major.$age.$revision"
- # Darwin ld doesn't like 0 for these options...
- minor_current=`expr $current + 1`
-- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
- ;;
-
- freebsd-aout)
-@@ -3272,8 +3349,11 @@
- ;;
-
- irix | nonstopux)
-- major=`expr $current - $age + 1`
--
-+ if test "X$lt_irix_increment" = "Xno"; then
-+ major=`expr $current - $age`
-+ else
-+ major=`expr $current - $age + 1`
-+ fi
- case $version_type in
- nonstopux) verstring_prefix=nonstopux ;;
- *) verstring_prefix=sgi ;;
-@@ -3410,11 +3490,11 @@
- fi
-
- # Eliminate all temporary directories.
-- for path in $notinst_path; do
-- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-- done
-+ #for path in $notinst_path; do
-+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-+ #done
-
- if test -n "$xrpath"; then
- # If the user specified any rpath flags, then add them.
-@@ -3515,13 +3595,12 @@
- int main() { return 0; }
- EOF
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
- name=`expr $i : '-l\(.*\)'`
- # If $name is empty we are operating on a -L argument.
-- if test "$name" != "" && test "$name" -ne "0"; then
-+ if test "$name" != "" && test "$name" != "0"; then
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
-@@ -3560,9 +3639,7 @@
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" != "0"; then
- $rm conftest
-- $LTCC $LTCFLAGS -o conftest conftest.c $i
-- # Did it work?
-- if test "$?" -eq 0 ; then
-+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
- ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
-@@ -3594,7 +3671,7 @@
- droppeddeps=yes
- $echo
- $echo "*** Warning! Library $i is needed by this library but I was not able to"
-- $echo "*** make it link in! You will probably need to install it or some"
-+ $echo "*** make it link in! You will probably need to install it or some"
- $echo "*** library that it depends on before this library will be fully"
- $echo "*** functional. Installing it before continuing would be even better."
- fi
-@@ -3880,7 +3957,10 @@
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
-- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-+ case $archive_cmds in
-+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-+ esac
- else
- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
-@@ -4190,9 +4270,10 @@
- ;;
-
- obj)
-- if test -n "$deplibs"; then
-- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-- fi
-+ case " $deplibs" in
-+ *\ -l* | *\ -L*)
-+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
-+ esac
-
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-@@ -4239,12 +4320,14 @@
- reload_conv_objs=
- gentop=
- # reload_cmds runs $LD directly, so let us get rid of
-- # -Wl from whole_archive_flag_spec
-+ # -Wl from whole_archive_flag_spec and hope we can get by with
-+ # turning comma into space..
- wl=
-
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
-- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
- else
- gentop="$output_objdir/${obj}x"
- generated="$generated $gentop"
-@@ -4692,16 +4775,16 @@
- case $host in
- *cygwin* | *mingw* )
- if test -f "$output_objdir/${outputname}.def" ; then
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
- else
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- fi
- ;;
- * )
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
- ;;
- esac
- ;;
-@@ -4716,13 +4799,13 @@
- # really was required.
-
- # Nullify the symbol file.
-- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
- fi
-
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- # Replace the output file specification.
-- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
- link_command="$compile_command$compile_rpath"
-
- # We have no uninstalled library dependencies, so finalize right now.
-@@ -4809,7 +4892,7 @@
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
-- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
- else
- # fast_install is set to needless
- relink_command=
-@@ -4846,7 +4929,7 @@
- fi
- done
- relink_command="(cd `pwd`; $relink_command)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- fi
-
- # Quote $echo for shipping.
-@@ -5253,6 +5336,20 @@
- Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
-
-+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-@@ -5395,7 +5492,7 @@
- ;;
- esac
- $echo >> $output "\
-- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-+ \$echo \"\$0: cannot exec \$program \$*\"
- exit $EXIT_FAILURE
- fi
- else
-@@ -5581,7 +5678,7 @@
- done
- # Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
- if test "$hardcode_automatic" = yes ; then
- relink_command=
- fi
-@@ -5926,9 +6023,9 @@
-
- if test -n "$inst_prefix_dir"; then
- # Stick the inst_prefix_dir data into the link command.
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
- else
-- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
- fi
-
- $echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6137,7 +6234,7 @@
- file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
- outputname="$tmpdir/$file"
- # Replace the output file specification.
-- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
- $show "$relink_command"
- if $run eval "$relink_command"; then :
-@@ -6348,8 +6445,10 @@
- if test -f "$dir/$objdir/$dlname"; then
- dir="$dir/$objdir"
- else
-- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-- exit $EXIT_FAILURE
-+ if test ! -f "$dir/$dlname"; then
-+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-+ exit $EXIT_FAILURE
-+ fi
- fi
- ;;
-
-@@ -6413,12 +6512,12 @@
- fi
-
- # Restore saved environment variables
-- if test "${save_LC_ALL+set}" = set; then
-- LC_ALL="$save_LC_ALL"; export LC_ALL
-- fi
-- if test "${save_LANG+set}" = set; then
-- LANG="$save_LANG"; export LANG
-- fi
-+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+ do
-+ eval "if test \"\${save_$lt_var+set}\" = set; then
-+ $lt_var=\$save_$lt_var; export $lt_var
-+ fi"
-+ done
-
- # Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
-@@ -6775,9 +6874,9 @@
- -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
- -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
- -export-symbols SYMFILE
-- try to export only the symbols listed in SYMFILE
-+ try to export only the symbols listed in SYMFILE
- -export-symbols-regex REGEX
-- try to export only the symbols matching REGEX
-+ try to export only the symbols matching REGEX
- -LLIBDIR search LIBDIR for required installed libraries
- -lNAME OUTPUT-FILE requires the installed library libNAME
- -module build a library that can dlopened
-@@ -6791,9 +6890,11 @@
- -release RELEASE specify package release information
- -rpath LIBDIR the created library will eventually be installed in LIBDIR
- -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-- -static do not do any dynamic linking of libtool libraries
-+ -static do not do any dynamic linking of uninstalled libtool libraries
-+ -static-libtool-libs
-+ do not do any dynamic linking of libtool libraries
- -version-info CURRENT[:REVISION[:AGE]]
-- specify library version info [each variable defaults to 0]
-+ specify library version info [each variable defaults to 0]
-
- All other options (arguments beginning with \`-') are ignored.
-
diff -urN libgnomeuimm-2.20.2.orig/scripts/Makefile.in libgnomeuimm-2.20.2/scripts/Makefile.in
--- libgnomeuimm-2.20.2.orig/scripts/Makefile.in 2008-02-11 00:31:11.000000000 +0800
-+++ libgnomeuimm-2.20.2/scripts/Makefile.in 2008-02-11 02:24:41.000000000 +0800
++++ libgnomeuimm-2.20.2/scripts/Makefile.in 2008-02-12 04:12:32.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19674,17 +18257,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -35,8 +35,7 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \
- config.sub depcomp install-sh ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -65,6 +64,7 @@
+@@ -65,6 +65,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -19692,11 +18265,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -100,10 +100,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -104,6 +105,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -19704,7 +18273,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -114,6 +114,7 @@
+@@ -114,6 +116,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -19714,7 +18283,7 @@
STRIP = @STRIP@
diff -urN libgnomeuimm-2.20.2.orig/tools/extra_defs_gen/Makefile.in libgnomeuimm-2.20.2/tools/extra_defs_gen/Makefile.in
--- libgnomeuimm-2.20.2.orig/tools/extra_defs_gen/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/tools/extra_defs_gen/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/tools/extra_defs_gen/Makefile.in 2008-02-12 04:12:32.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19726,17 +18295,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,8 +39,7 @@
- subdir = tools/extra_defs_gen
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -50,7 +49,7 @@
+@@ -50,7 +50,7 @@
am_generate_extra_defs_OBJECTS = generate_defs_libgnomeui.$(OBJEXT)
generate_extra_defs_OBJECTS = $(am_generate_extra_defs_OBJECTS)
generate_extra_defs_LDADD = $(LDADD)
@@ -19745,7 +18304,7 @@
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -87,6 +86,7 @@
+@@ -87,6 +87,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -19753,11 +18312,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -122,10 +122,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -126,6 +127,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -19765,7 +18320,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -136,6 +136,7 @@
+@@ -136,6 +138,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -19773,7 +18328,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -277,8 +278,8 @@
+@@ -277,8 +280,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19784,7 +18339,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -290,8 +291,8 @@
+@@ -290,8 +293,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19795,7 +18350,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -301,13 +302,12 @@
+@@ -301,13 +304,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -19813,7 +18368,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/tools/m4/Makefile.in libgnomeuimm-2.20.2/tools/m4/Makefile.in
--- libgnomeuimm-2.20.2.orig/tools/m4/Makefile.in 2008-02-11 00:31:11.000000000 +0800
-+++ libgnomeuimm-2.20.2/tools/m4/Makefile.in 2008-02-11 02:24:41.000000000 +0800
++++ libgnomeuimm-2.20.2/tools/m4/Makefile.in 2008-02-12 04:12:32.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19825,17 +18380,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -37,8 +37,7 @@
- $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment
- subdir = tools/m4
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -78,6 +77,7 @@
+@@ -78,6 +78,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -19843,11 +18388,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -113,10 +113,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -117,6 +118,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -19855,7 +18396,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -127,6 +127,7 @@
+@@ -127,6 +129,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -19863,7 +18404,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -251,8 +252,8 @@
+@@ -251,8 +254,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19874,7 +18415,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -264,8 +265,8 @@
+@@ -264,8 +267,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19885,7 +18426,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -275,13 +276,12 @@
+@@ -275,13 +278,12 @@
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
@@ -19903,7 +18444,7 @@
$$tags $$unique
diff -urN libgnomeuimm-2.20.2.orig/tools/Makefile.in libgnomeuimm-2.20.2/tools/Makefile.in
--- libgnomeuimm-2.20.2.orig/tools/Makefile.in 2008-02-11 00:31:10.000000000 +0800
-+++ libgnomeuimm-2.20.2/tools/Makefile.in 2008-02-11 02:24:40.000000000 +0800
++++ libgnomeuimm-2.20.2/tools/Makefile.in 2008-02-12 04:12:32.000000000 +0800
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19915,17 +18456,7 @@
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -36,8 +36,7 @@
- $(top_srcdir)/tools/m4/Makefile_list_of_sources.am_fragment
- subdir = tools
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/scripts/macros.m4 \
-- $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -78,6 +77,7 @@
+@@ -78,6 +78,7 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
@@ -19933,11 +18464,7 @@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -113,10 +113,10 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
--M4 = @M4@
+@@ -117,6 +118,7 @@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
@@ -19945,7 +18472,7 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -127,6 +127,7 @@
+@@ -127,6 +129,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
@@ -19953,7 +18480,7 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-@@ -303,8 +304,8 @@
+@@ -303,8 +306,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19964,7 +18491,7 @@
mkid -fID $$unique
tags: TAGS
-@@ -329,8 +330,8 @@
+@@ -329,8 +332,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19975,7 +18502,7 @@
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -340,13 +341,12 @@
+@@ -340,13 +343,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
More information about the pkg-gnome-commits
mailing list