[newlib-cygwin] Cygwin: Remove AC_ARG_PROGRAM/program_transform_name
Jon TURNEY
jturney@sourceware.org
Wed Oct 14 14:40:29 GMT 2020
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=177d15686df7bb6208e559e56e30a4a5a06087be
commit 177d15686df7bb6208e559e56e30a4a5a06087be
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Oct 12 14:18:17 2020 +0100
Cygwin: Remove AC_ARG_PROGRAM/program_transform_name
Not done consistently, and probably never used.
Diff:
---
winsup/cygwin/configure | 2 --
winsup/cygwin/configure.ac | 15 ---------------
winsup/lsaauth/configure.ac | 2 --
winsup/utils/Makefile.in | 4 +---
winsup/utils/configure | 16 ----------------
winsup/utils/configure.ac | 2 --
6 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index 54b7f04c3..ff80f0c55 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -4403,8 +4403,6 @@ esac
fi
-
-
case "$target_cpu" in
i?86)
DLL_NAME="cygwin1.dll"
diff --git a/winsup/cygwin/configure.ac b/winsup/cygwin/configure.ac
index ac019c94e..757ebcfb0 100644
--- a/winsup/cygwin/configure.ac
+++ b/winsup/cygwin/configure.ac
@@ -67,21 +67,6 @@ no) ;;
esac
])
-dnl The only time we might want to transform the install names
-dnl is for unix x cygwin. Otherwise we don't. For now we don't
-dnl transform names.
-
-dnl if test "x$cross_compiling" = "xno" -a ; then
-dnl if test "x$program_transform_name" = "xs,x,x,"; then
-dnl program_transform_name=""
-dnl fi
-dnl if test "x$program_transform_name" = "x"; then
-dnl program_transform_name="s,^,$target_alias-,"
-dnl else
-dnl program_transform_name="$program_transform_name -e s,^,$target_alias-,"
-dnl fi
-dnl fi
-
case "$target_cpu" in
i?86)
DLL_NAME="cygwin1.dll"
diff --git a/winsup/lsaauth/configure.ac b/winsup/lsaauth/configure.ac
index 995a0991d..f2b2c6329 100644
--- a/winsup/lsaauth/configure.ac
+++ b/winsup/lsaauth/configure.ac
@@ -32,8 +32,6 @@ esac
AC_CHECK_PROGS(MINGW64_CC, x86_64-w64-mingw32-gcc)
test -z "$MINGW64_CC" && AC_MSG_ERROR([no acceptable mingw64 cc found in \$PATH])
-AC_ARG_PROGRAM
-
AC_PROG_INSTALL
AC_CONFIG_FILES([Makefile cyglsa.def:cyglsa.din])
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index 248939645..c3297c6c1 100644
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -37,7 +37,6 @@ prefix:=@prefix@
exec_prefix:=@exec_prefix@
bindir:=@bindir@
-program_transform_name:=@program_transform_name@
override INSTALL:=@INSTALL@
override INSTALL_PROGRAM:=@INSTALL_PROGRAM@
@@ -176,8 +175,7 @@ realclean: clean
install: all
/bin/mkdir -p ${DESTDIR}${bindir}
for i in $(CYGWIN_BINS) ${filter-out testsuite.exe,$(MINGW_BINS)} ; do \
- n=`echo $$i | sed '$(program_transform_name)'`; \
- $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$n; \
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
done
$(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile
diff --git a/winsup/utils/configure b/winsup/utils/configure
index 4408c9f91..3ad7c8a68 100755
--- a/winsup/utils/configure
+++ b/winsup/utils/configure
@@ -1273,11 +1273,6 @@ _ACEOF
cat <<\_ACEOF
-Program names:
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
@@ -3152,17 +3147,6 @@ export CXX
-test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
diff --git a/winsup/utils/configure.ac b/winsup/utils/configure.ac
index 63fc55e56..ce35f9c7b 100644
--- a/winsup/utils/configure.ac
+++ b/winsup/utils/configure.ac
@@ -28,8 +28,6 @@ AC_PROG_CXX
AC_CYGWIN_INCLUDES
-AC_ARG_PROGRAM
-
AC_PROG_INSTALL
AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++)
More information about the Cygwin-cvs
mailing list