X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=convert_configure.pl;fp=convert_configure.pl;h=dea92ca5d8cc96961e5ff38709d4e448755ebb80;hp=9d1026d16878ce3a8e4ecbe02376b852391d5b18;hb=c633e5103a29a38532cf1925257b91cea33fd090;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34

diff --git a/convert_configure.pl b/convert_configure.pl
index 9d1026d1..dea92ca5 100644
--- a/convert_configure.pl
+++ b/convert_configure.pl
@@ -8,47 +8,83 @@ extproc perl -S -w
 #
 # run the result like this:
 #    .\configure
-;
+
+# Some frequent manual intervention:
+# a) Some makefiles hardwire SHELL = /bin/sh ==> change to: sh
+# b) Some makefiles recognize that exe files terminate on .exe
+#    You need to give this script -no-zexe option...
+
+shift, $no_zexe = 1 if @ARGV and $ARGV[0] eq '-no-zexe';
 
 mkdir '/tmp', 0777 unless -d '/tmp';
 
 print <<EOF;
 extproc sh
 
+EOF
+
+print <<EOF unless $no_zexe;
 # Make sensible defaults:
-CC="gcc -Zexe"
+CC="gcc -Zexe -Zmt"
 export CC
+CXX="gcc -Zexe -Zmt"
+export CXX
 #GCCOPT="$GCCOPT -Zexe"
 #export GCCOPT
+EOF
+
+print <<EOF;
 CONFIG_SHELL=sh
+export CONFIG_SHELL
+
+# Optimization (GNU make 3.74 cannot be loaded :-():
+emxload -m 30 sh.exe ls.exe tr.exe id.exe sed.exe # make.exe 
+emxload -m 30 grep.exe egrep.exe fgrep.exe cat.exe rm.exe mv.exe cp.exe
+emxload -m 30 uniq.exe basename.exe sort.exe awk.exe echo.exe
+
 
 EOF
 
 $checking_path = 0;
 
 while (<>) {
-  if (/for\s+(\w+)\s+in\s*\$PATH\s*;/) {
+  if (/for\s+(\w+)\s+in\s*\$(PATH|ac_dummy)\s*;/) {
     $checking_path = 1;
     $varname = $1;
     $subst= <<EOS
 $varname="`echo -E \\"\$$varname\\" | tr \\\\\\\\\\\\\\\\ / `"
 EOS
   } 
-  $checking_path = 0 if /^\s*done\s*$/;
+  if (/if\s+test\s+-z\s+\"\$INSTALL\"/) {
+    $checking_install = 1;
+  } 
+  $checking_install = $checking_path = 0 if /^\s*done\s*$/;
   # We want to create an extra line like this one:
 #   ac_dir="`echo -E \"$ac_dir\" | tr \\\\\\\\ / `"
   s{^((\s*)if\s+test)\s*-f\s*(\$$varname/\S+)\s*;}
-    {$2$subst$1 -f $3 -o -f $3.exe ;}
+   {$2$subst$1 -f $3 -o -f $3.exe ;}
       if $checking_path;	# Checking for executables
-  s/^host=NONE$/host=os2/;	# Make default host
+  # change |/usr/sbin/*| to |/usr/sbin/*|?:[\\/]os2[\\/]install[\\/]*|
+  # in the list of things to skip (with both cases)
+  s{\Q|/usr/sbin/*|}
+   {|/usr/sbin/*|?:[\\\\/]os2[\\\\/]install[\\\\/]*|?:[\\\\/]OS2[\\\\/]INSTALL[\\\\/]*|}
+      if $checking_install;	# Do not accept d:/os2/install/install.exe
+  s/^(host|build)=NONE$/$1=x86-emx-os2/;	# Make default host/build
   s/"\$\{IFS}:"$/"\${IFS};"/;	# Fix IFS line
+  s/\bIFS=\":\"$/IFS=";"/;	# Fix another IFS line
   s/\btest\s+-s\s+conftest\b/test -f conftest/g; # Fix exe test
   # This one is needed for curses:
-  s/host=`\$ac_config_sub \$host_alias`/$&\nif test -z "$host"; then host=\$host_alias; fi/;
+  s/^\s*host=`.*\$ac_config_sub \$host_alias`/$&\nif test -z "\$host"; then host=\$host_alias; fi/;
   s,/bin/sh(?![/\w]),sh,g;
+  s,^(\s*/usr/sbin/sendmail\s*)\\$,$1 "`whence sendmail | tr '\\\\\\\\' / `" \\,;
   print;
 }
 
 __END__
 
-Changes: 98/11 : support check for executables in ncurses.
+Changes:	98/11 : support check for executables in ncurses.
+		99/2  : support INSTALL, 
+			new IFS=':' style
+		99/11 : find sendmail
+		00/01 : export CONFIG_SHELL
+		00/10 : new syntax for host=`...` line