2014-03-13 Mike Frysinger <vapier@gentoo.org>
+ * config.make.in (have-bash2): Delete.
+ * configure.ac (libc_cv_have_bash2): Delete.
+ * configure: Regenerate.
+ * elf/Makefile (common-ldd-rewrite): Rename to ...
+ (ldd-rewrite): ... this. Move bash-ldd-rewrite content to end.
+ (sh-ldd-rewrite): Delete.
+ (bash-ldd-rewrite): Delete.
+ (have-bash2): Delete checks.
+ [ldd-rewrite-script]: Change $(ldd-shell)-ldd-rewrite to ldd-rewrite.
+
+2014-03-13 Mike Frysinger <vapier@gentoo.org>
+
* config.make.in (have-ksh): Delete.
(KSH): Delete.
* configure.ac (libc_cv_have_ksh): Delete.
mach-interface-list = @mach_interface_list@
-have-bash2 = @libc_cv_have_bash2@
-
sizeof-long-double = @sizeof_long_double@
nss-crypt = @libc_cv_nss_crypt@
BISON
INSTALL_INFO
PERL
-libc_cv_have_bash2
BASH_SHELL
libc_cv_gcc_static_libgcc
CXX_SYSINCLUDES
fi
-if test "$BASH_SHELL" != no &&
- $BASH_SHELL -c 'test "$BASH_VERSINFO" \
- && test "$BASH_VERSINFO" -ge 2 >&/dev/null'; then
- libc_cv_have_bash2=yes
-else
- libc_cv_have_bash2=no
-fi
-
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
AC_SUBST(libc_cv_gcc_static_libgcc)
AC_PATH_PROG(BASH_SHELL, bash, no)
-if test "$BASH_SHELL" != no &&
- $BASH_SHELL -c 'test "$BASH_VERSINFO" \
- && test "$BASH_VERSINFO" -ge 2 >&/dev/null'; then
- libc_cv_have_bash2=yes
-else
- libc_cv_have_bash2=no
-fi
-AC_SUBST(libc_cv_have_bash2)
AC_PATH_PROG(PERL, perl, no)
if test "$PERL" != no &&
endif
-common-ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
- -e 's%@VERSION@%$(version)%g' \
- -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
- -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g'
-sh-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%/bin/sh%g;s/\$$"/"/g'
-bash-ldd-rewrite = $(common-ldd-rewrite) -e 's%@BASH@%$(BASH)%g' \
- -e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g'
-
-ifneq ($(have-bash2),yes)
-ldd-shell = sh
-else
-ldd-shell = bash
-endif
+ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \
+ -e 's%@VERSION@%$(version)%g' \
+ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \
+ -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \
+ -e 's%@BASH@%$(BASH)%g' \
+ -e 's%@TEXTDOMAINDIR@%$(msgcatdir)%g'
ifeq ($(ldd-rewrite-script),no)
define gen-ldd
-LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< > $@.new
+LC_ALL=C sed $(ldd-rewrite) < $< > $@.new
endef
else
define gen-ldd
-LC_ALL=C sed $($(ldd-shell)-ldd-rewrite) < $< \
+LC_ALL=C sed $(ldd-rewrite) < $< \
| LC_ALL=C sed -f $(patsubst $(..)/%,/%,$(..)$(ldd-rewrite-script)) > $@.new
endef
endif