Cygwin: Remove AC_ARG_PROGRAM/program_transform_name
Not done consistently, and probably never used.
This commit is contained in:
		
							parent
							
								
									b21158bc4e
								
							
						
					
					
						commit
						177d15686d
					
				|  | @ -4403,8 +4403,6 @@ esac | ||||||
| fi | fi | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| case "$target_cpu" in | case "$target_cpu" in | ||||||
|    i?86) |    i?86) | ||||||
| 		DLL_NAME="cygwin1.dll" | 		DLL_NAME="cygwin1.dll" | ||||||
|  |  | ||||||
|  | @ -67,21 +67,6 @@ no)	 ;; | ||||||
| esac | 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 | case "$target_cpu" in | ||||||
|    i?86) |    i?86) | ||||||
| 		DLL_NAME="cygwin1.dll" | 		DLL_NAME="cygwin1.dll" | ||||||
|  |  | ||||||
|  | @ -32,8 +32,6 @@ esac | ||||||
| AC_CHECK_PROGS(MINGW64_CC, x86_64-w64-mingw32-gcc) | AC_CHECK_PROGS(MINGW64_CC, x86_64-w64-mingw32-gcc) | ||||||
| test -z "$MINGW64_CC" && AC_MSG_ERROR([no acceptable mingw64 cc found in \$PATH]) | test -z "$MINGW64_CC" && AC_MSG_ERROR([no acceptable mingw64 cc found in \$PATH]) | ||||||
| 
 | 
 | ||||||
| AC_ARG_PROGRAM |  | ||||||
| 
 |  | ||||||
| AC_PROG_INSTALL | AC_PROG_INSTALL | ||||||
| 
 | 
 | ||||||
| AC_CONFIG_FILES([Makefile cyglsa.def:cyglsa.din]) | AC_CONFIG_FILES([Makefile cyglsa.def:cyglsa.din]) | ||||||
|  |  | ||||||
|  | @ -37,7 +37,6 @@ prefix:=@prefix@ | ||||||
| exec_prefix:=@exec_prefix@ | exec_prefix:=@exec_prefix@ | ||||||
| 
 | 
 | ||||||
| bindir:=@bindir@ | bindir:=@bindir@ | ||||||
| program_transform_name:=@program_transform_name@ |  | ||||||
| 
 | 
 | ||||||
| override INSTALL:=@INSTALL@ | override INSTALL:=@INSTALL@ | ||||||
| override INSTALL_PROGRAM:=@INSTALL_PROGRAM@ | override INSTALL_PROGRAM:=@INSTALL_PROGRAM@ | ||||||
|  | @ -176,8 +175,7 @@ realclean: clean | ||||||
| install: all | install: all | ||||||
| 	/bin/mkdir -p ${DESTDIR}${bindir} | 	/bin/mkdir -p ${DESTDIR}${bindir} | ||||||
| 	for i in $(CYGWIN_BINS) ${filter-out testsuite.exe,$(MINGW_BINS)} ; do \
 | 	for i in $(CYGWIN_BINS) ${filter-out testsuite.exe,$(MINGW_BINS)} ; do \
 | ||||||
| 	  n=`echo $$i | sed '$(program_transform_name)'`; \
 | 	  $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
 | ||||||
| 	  $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$n; \
 |  | ||||||
| 	done | 	done | ||||||
| 
 | 
 | ||||||
| $(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile | $(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile | ||||||
|  |  | ||||||
|  | @ -1273,11 +1273,6 @@ _ACEOF | ||||||
| 
 | 
 | ||||||
|   cat <<\_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: | System types: | ||||||
|   --build=BUILD     configure for building on BUILD [guessed] |   --build=BUILD     configure for building on BUILD [guessed] | ||||||
|   --host=HOST       cross-compile to build programs to run on HOST [BUILD] |   --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), | # Find a good install program.  We prefer a C program (faster), | ||||||
| # so one script is as good as another.  But avoid the broken or | # so one script is as good as another.  But avoid the broken or | ||||||
| # incompatible versions: | # incompatible versions: | ||||||
|  |  | ||||||
|  | @ -28,8 +28,6 @@ AC_PROG_CXX | ||||||
| 
 | 
 | ||||||
| AC_CYGWIN_INCLUDES | AC_CYGWIN_INCLUDES | ||||||
| 
 | 
 | ||||||
| AC_ARG_PROGRAM |  | ||||||
| 
 |  | ||||||
| AC_PROG_INSTALL | AC_PROG_INSTALL | ||||||
| 
 | 
 | ||||||
| AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++) | AC_CHECK_PROGS(MINGW_CXX, ${target_cpu}-w64-mingw32-g++) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue