From da88dadabdd0c543887003e8b8eb7c191cf4dec2 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 26 Jan 1995 00:46:29 +0000 Subject: [PATCH] the usual --- ChangeLog | 143 ++++++++++++++++++++++++++++ configure | 274 ++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 329 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index 376f2f0e2d0..a57f6d60890 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,146 @@ +Thu Jan 26 00:42:29 1995 Guido van Rossum + + * Lib/mhlib.py: fix bogus test for matching regex + + * stdwinmodule.c: (re)move some unused variables + + * Python/pythonrun.c (run_pyc_file): made static + (fatal): loop forever on Mac, so error message remains visible + + * Python/import.c (doneimport): no need to dictclear() the + module's dictionary (that's done automatically when the module is + actually deleted) + + * Objects/classobject.c (instancebinop): removed unused variables + + * Objects/moduleobject.c (module_dealloc): explicitly erase a + module's dictionary when the module object disappears -- this was + formerly done in import's doneimport() + + * Objects/object.c, Python/bltinmodule.c: moved callable() to + object.c (from static in bltinmodule.c) since it is generally + useful (and I needed it :-) + +Wed Jan 25 13:20:52 1995 Guido van Rossum + + * Modules/posixmodule.c (posix_utime): Be more robust in the light + of unusual types for uname struct members and 64-bit longs + + * Python/ceval.c (eval_code): mods to allow using classes as + exceptions (R Lindsay Todd) + +Mon Jan 23 20:48:16 1995 Guido van Rossum + + * configure.in (LDSHARED): add case for OSF/1 (Bob Kras); + (socket libraries): add conditional for IRIX 5, where -lsocket + exists but doesn't seem to work properly + + * Python/compile.c (get_docstring): add missing case for + file_input, so __doc__ strings in modules work + +Sun Jan 22 20:45:40 1995 Guido van Rossum + + * Modules/regexmodule.c (reg_dealloc): free the compiled pattern + buffer -- plugs a memory leak + +Sun Jan 22 01:44:01 1995 Guido van Rossum + + * Modules/signalmodule.c (sigcheck): renamed to PyErr_CheckSignals + -- signal checking was broken because of this! + +Sat Jan 21 15:10:08 1995 Guido van Rossum + + * Python/getargs.c (seterror): don't overwrite error if one is + already set (e.g. by O& handler) + (convertsimple1): return "(unspecified)" instead of empty string + for type description of "O&" object + +Fri Jan 20 15:27:51 1995 Guido van Rossum + + * Modules/Makefile.pre.in (sharedinstall): add command to make the + $(DESTSHARED) directory + + * README: change NeXT hint to add -posix to C compiler flags + + * Python/import.c: document the fact that almost all functions + returning a module object (except add_module()) increment its + reference count, and add missing INCREF calls here and there + + * Python/bltinmodule.c (builtin___import__): don't INCREF the + module -- import_module() has already done that + + * Python/ceval.c (eval_code, RAISE_EXCEPTION): add missing INCREF + after gettupleitem() call (R Lindsay Todd) + + * configure.in: added check for working getopt (R Lindsay Todd); + modernize all tests to use cache and report outcome (John + Interrante) + + * Include/{classobject.h,listobject.h}: corrected two unconverted + names (found by John Interrante) + +Thu Jan 19 01:31:46 1995 Guido van Rossum + + * configure.in (LDSHARED): added case for Sequent DYNIX (Jaap + Vermeulen) + + * Mac/macglue.c (Pstring): truncate string to 255 bytes + + * Objects/listobject.c (list_dealloc): Fix NULL dereference in + case of out-of-memory condition (Jack) + + * Parser/intrcheck.c (intrpeek): new Mac specific routine to test + for interrupt without clearing the interrupt flag (Jack) + + * Python/errors.c (strerror): #undef it first on the Mac (Jack) + + * Lib/ftplib.py: don't break if os.environ doesn't exist (Jack) + + * Modules/timemodule.c (inittime): fix memory leaks (should decref + new objects passed to dictinsert) + + * Python/compile.c (optimize): fix memory leak (forgot to decref + localmap) + + * Objects/funcobject.c (func_dealloc): fix memory leak (forgot to + decref func_name) + + * Python/importdl.c: added changes for NetBSD dynamic linking + (David Hobley); removed shared linking for NeXT (incompatible with + the -posix flag) + + * Modules/mathmodule.c: removed empty #ifdef macintosh...#endif + + * Parser/parsetok.c (parsetok): avoid uninitialized memory read + + * Mac: various stuff to port Jack's mods back to THINK C, as well + as my own changes for apple events + + * Python/modsupport.c: support "O&" taking an object constructor + and a void* (sort of inverse of O& in getargs) + + * configure.in, Makefile.in: mods to define and use + INSTALL_PROGRAM and INSTALL_DATA as well as INSTALL (John + Interrante) + +Wed Jan 18 12:01:20 1995 Guido van Rossum + + * Mac: lots of new stuff checked in by jack + + * configure.in: added test for genuine getopt (R Lindsay Todd) + + * Python/Makefile.in: removed getopt.o from OBJS (but left in + getopt.o: getopt.c rule) + + * Python/getopt.c: don't use function prototypes (Anthony Baxter) + + * Modules/arraymodule.c: make the routines static now that their + forward declarations are! (Anthony Baxter) + +======================================== +==> Release 1.2 BETA 2 (17 Jan 1995) <== +======================================== + Tue Jan 17 11:24:23 1995 Guido van Rossum * Include/patchlevel.h: set version to 1.2-beta-2 diff --git a/configure b/configure index 177b42ae190..ed2f7e8a081 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #!/bin/sh -# From configure.in Revision: 1.15 +# From configure.in Revision: 1.18 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.0 @@ -417,18 +417,25 @@ fi # checks for alternative programs -echo "checking for --with(out)-gcc" 1>&4 +echo $ac_n "checking for --without-gcc""... $ac_c" 1>&4 # Check whether --with-gcc or --without-gcc was given. withval="$with_gcc" if test -n "$withval"; then case $withval in - no) withval=cc;; - yes) withval=gcc;; + no) CC=cc + without_gcc=yes;; + yes) CC=gcc + without_gcc=no;; + *) CC=$withval + without_gcc=$withval;; esac - CC=$withval +else + without_gcc=no fi +echo "$ac_t""$without_gcc" 1>&4 + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&4 @@ -565,9 +572,17 @@ done test -n "$AR" || AR="ar" + + # Install just never works :-( if test -z "$INSTALL" -then INSTALL=cp +then + INSTALL=cp + INSTALL_PROGRAM=cp + INSTALL_DATA=cp +else + INSTALL_PROGRAM="$INSTALL" + INSTALL_DATA="$INSTALL -m 644" fi # Optimizer/debugger flags passed between Makefiles @@ -591,7 +606,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error @@ -605,7 +620,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error @@ -630,7 +645,7 @@ echo "$ac_t""$CPP" 1>&4 echo $ac_n "checking for AIX""... $ac_c" 1>&4 cat > conftest.$ac_ext <&4 else cat > conftest.$ac_ext < EOF @@ -716,7 +731,8 @@ EOF fi -echo "checking for NeXT" 1>&4 + +was_it_defined=no # If we cannot run a trivial program, we must be cross compiling. echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&4 if eval "test \"`echo '${'ac_cv_c_cross'+set}'`\" = set"; then @@ -726,7 +742,7 @@ else ac_cv_cross=yes else cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext </dev/null; then cat >> confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF - + was_it_defined=yes fi fi rm -fr conftest* +echo $ac_n "checking for NeXT""... $ac_c" 1>&4 +echo "$ac_t""$was_it_defined" 1>&4 # checks for header files echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&4 @@ -770,7 +788,7 @@ if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #include @@ -792,7 +810,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -810,7 +828,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -831,7 +849,7 @@ if test "$cross_compiling" = yes; then ac_cv_header_stdc=no else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -868,7 +886,7 @@ if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < EOF @@ -905,7 +923,7 @@ if eval "test \"`echo '${'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -944,7 +962,7 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS -ldir " cat > conftest.$ac_ext < conftest.$ac_ext <&4 +was_it_defined=no +echo $ac_n "checking for clock_t in time.h""... $ac_c" 1>&4 cat > conftest.$ac_ext < EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "clock_t" >/dev/null 2>&1; then - : + rm -rf conftest* + was_it_defined=yes else rm -rf conftest* cat >> confdefs.h <<\EOF @@ -1026,12 +1046,14 @@ EOF fi rm -f conftest* +echo "$ac_t""$was_it_defined" 1>&4 + echo $ac_n "checking for mode_t""... $ac_c" 1>&4 if eval "test \"`echo '${'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1062,7 +1084,7 @@ if eval "test \"`echo '${'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1093,7 +1115,7 @@ if eval "test \"`echo '${'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1124,7 +1146,7 @@ if eval "test \"`echo '${'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #include @@ -1158,7 +1180,7 @@ if eval "test \"`echo '${'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1189,7 +1211,7 @@ if eval "test \"`echo '${'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < EOF @@ -1260,6 +1282,8 @@ then SunOS/4*) LDSHARED="ld";; SunOS/5*) LDSHARED="ld -G";; hp*|HP*) LDSHARED="ld -b";; + OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";; + DYNIX/ptx*) LDSHARED="ld -G";; *) LDSHARED="ld";; esac fi @@ -1293,7 +1317,7 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS -ldl " cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&4 fi # NIS (== YP) interface for IRIX 4 +# The following three (nsl,inet,socket) are needed on Sequent; +# the order of checking must be this. Most SVR4 platforms will +# need -lsocket and -lnsl. However on SGI IRIX 5, these exist but +# broken. I see no elegant solution (probably CHECK_LIB should be +# fixed to only add the library if the given entry point is not +# satisfied without it). +if test "`uname -s`" != IRIX +then echo $ac_n "checking for -lnsl""... $ac_c" 1>&4 if eval "test \"`echo '${'ac_cv_lib_nsl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 @@ -1410,7 +1442,7 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS -lnsl " cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&4 fi # SVR4 sockets +fi -echo "checking for --with-readline" 1>&4 +echo $ac_n "checking for --with-readline""... $ac_c" 1>&4 # Check whether --with-readline or --without-readline was given. withval="$with_readline" if test -n "$withval"; then +echo "$ac_t""$withval" 1>&4 cat >> confdefs.h <<\EOF #define WITH_READLINE 1 EOF @@ -1523,7 +1557,7 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS -ltermcap " cat > conftest.$ac_ext < conftest.$ac_ext <&2; exit 1; } fi +else + echo "$ac_t""no" 1>&4 fi -echo "checking for --with-thread" 1>&4 +echo $ac_n "checking for --with-thread""... $ac_c" 1>&4 # Check whether --with-thread or --without-thread was given. withval="$with_thread" if test -n "$withval"; then +echo "$ac_t""$withval" 1>&4 if test -d "$withval" then LIBS="$LIBS -L$withval" fi @@ -1611,7 +1648,7 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS -lpthreads " cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&4 fi @@ -1730,11 +1769,12 @@ fi DLINCLDIR=/ -echo "checking for --with-sgi-dl" 1>&4 +echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&4 # Check whether --with-sgi-dl or --without-sgi-dl was given. withval="$with_sgi_dl" if test -n "$withval"; then +echo "$ac_t""$withval" 1>&4 cat >> confdefs.h <<\EOF #define WITH_SGI_DL 1 EOF @@ -1746,14 +1786,17 @@ else { echo "configure: error: proper usage is --with-sgi-dl=DIRECTORY" 1>&2; ex fi DLINCLDIR=${dldir} LIBS="$LIBS -ldl -lmld" +else + echo "$ac_t""no" 1>&4 fi -echo "checking for --with-dl-dld" 1>&4 +echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&4 # Check whether --with-dl-dld or --without-dl-dld was given. withval="$with_dl_dld" if test -n "$withval"; then +echo "$ac_t""$withval" 1>&4 cat >> confdefs.h <<\EOF #define WITH_DL_DLD 1 EOF @@ -1766,6 +1809,8 @@ else { echo "configure: error: proper usage is --with-dl-dld=DL_DIRECTORY" 1>&2; fi DLINCLDIR=${dldir} LIBS="$LIBS -ldl -ldld" +else + echo "$ac_t""no" 1>&4 fi @@ -1777,7 +1822,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < /* Arbitrary system header to define __stub macros. */ int main() { return 0; } @@ -1824,7 +1869,7 @@ if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < /* Arbitrary system header to define __stub macros. */ int main() { return 0; } @@ -1867,7 +1912,7 @@ if eval "test \"`echo '${'ac_cv_func_getpgrp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < /* Arbitrary system header to define __stub macros. */ int main() { return 0; } @@ -1898,7 +1943,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getpgrp`\" = yes"; then echo "$ac_t""yes" 1>&4 cat > conftest.$ac_ext < int main() { return 0; } @@ -1924,7 +1969,7 @@ if eval "test \"`echo '${'ac_cv_func_setpgrp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < /* Arbitrary system header to define __stub macros. */ int main() { return 0; } @@ -1955,7 +2000,7 @@ fi if eval "test \"`echo '$ac_cv_func_'setpgrp`\" = yes"; then echo "$ac_t""yes" 1>&4 cat > conftest.$ac_ext < int main() { return 0; } @@ -1981,7 +2026,7 @@ if eval "test \"`echo '${'ac_cv_func_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < /* Arbitrary system header to define __stub macros. */ int main() { return 0; } @@ -2012,7 +2057,7 @@ fi if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then echo "$ac_t""yes" 1>&4 cat > conftest.$ac_ext < int main() { return 0; } @@ -2042,7 +2087,7 @@ if eval "test \"`echo '${'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #include @@ -2075,7 +2120,7 @@ if eval "test \"`echo '${'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #include @@ -2107,7 +2152,7 @@ if eval "test \"`echo '${'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -2138,7 +2183,7 @@ if eval "test \"`echo '${'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -2174,7 +2219,7 @@ if eval "test \"`echo '${'ac_cv_header_time_altzone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&4 else cat > conftest.$ac_ext < int main() { return 0; } @@ -2201,9 +2246,10 @@ EOF fi -echo "checking whether sys/select.h and sys/time.h may both be included" 1>&4 +was_it_defined=no +echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&4 cat > conftest.$ac_ext < @@ -2220,10 +2266,11 @@ if eval $ac_compile; then cat >> confdefs.h <<\EOF #define SYS_SELECT_WITH_SYS_TIME 1 EOF - + was_it_defined=yes fi rm -f conftest* +echo "$ac_t""$was_it_defined" 1>&4 # checks for compiler characteristics @@ -2234,7 +2281,7 @@ else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&4 else cat > conftest.$ac_ext <&4 +works=no +echo $ac_n "checking for working volatile""... $ac_c" 1>&4 cat > conftest.$ac_ext <> confdefs.h <<\EOF @@ -2380,10 +2429,12 @@ EOF fi rm -f conftest* +echo "$ac_t""$works" 1>&4 -echo "checking for working signed char" 1>&4 +works=no +echo $ac_n "checking for working signed char""... $ac_c" 1>&4 cat > conftest.$ac_ext <> confdefs.h <<\EOF @@ -2402,10 +2454,12 @@ EOF fi rm -f conftest* +echo "$ac_t""$works" 1>&4 -echo "checking for prototypes" 1>&4 +have_prototypes=no +echo $ac_n "checking for prototypes""... $ac_c" 1>&4 cat > conftest.$ac_ext <&4 -echo "checking for variable length prototypes and stdarg.h" 1>&4 +works=no +echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&4 cat > conftest.$ac_ext < @@ -2441,15 +2497,17 @@ if eval $ac_compile; then cat >> confdefs.h <<\EOF #define HAVE_STDARG_PROTOTYPES 1 EOF - + works=yes fi rm -f conftest* +echo "$ac_t""$works" 1>&4 -if test "$have_prototypes"; then -echo "checking for bad exec* prototypes" 1>&4 +if test "$have_prototypes" = yes; then +bad_prototypes=no +echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&4 cat > conftest.$ac_ext < int main() { return 0; } @@ -2464,18 +2522,20 @@ else cat >> confdefs.h <<\EOF #define BAD_EXEC_PROTOTYPES 1 EOF - + bad_prototypes=yes fi rm -f conftest* +echo "$ac_t""$bad_prototypes" 1>&4 fi -echo "checking for bad static forward" 1>&4 +bad_forward=no +echo $ac_n "checking for bad static forward""... $ac_c" 1>&4 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <> confdefs.h <<\EOF #define BAD_STATIC_FORWARD 1 EOF - + bad_forward=yes fi fi rm -fr conftest* +echo "$ac_t""$bad_forward" 1>&4 -echo "checking whether va_list is an array" 1>&4 +va_list_is_array=no +echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&4 cat > conftest.$ac_ext <> confdefs.h <<\EOF #define VA_LIST_IS_ARRAY 1 EOF - + va_list_is_array=yes fi rm -f conftest* +echo "$ac_t""$va_list_is_array" 1>&4 # checks for system services # (none yet) @@ -2542,7 +2605,7 @@ else ac_save_LIBS="$LIBS" LIBS="$LIBS -lieee " cat > conftest.$ac_ext <&4 else cat > conftest.$ac_ext < /* Arbitrary system header to define __stub macros. */ int main() { return 0; } @@ -2654,6 +2717,39 @@ done LIBS=$LIBS_SAVE +# check for getopt +echo $ac_n "checking for genuine getopt""... $ac_c" 1>&4 +if eval "test \"`echo '${'ac_cv_func_getopt'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&4 +else + if test "$cross_compiling" = yes; then + ac_cv_func_getopt=no +else +cat > conftest.$ac_ext < +extern int optind, opterr, getopt(); +extern char* optarg; +int main() { + char* av[] = { "testprog", "parameter", "-fFlag", NULL }; + opterr = 0; + if (getopt(3, av, "f:") == 'f') { exit(1); } + exit(0); +} +EOF +eval $ac_link +if test -s conftest && (./conftest; exit) 2>/dev/null; then + ac_cv_func_getopt=yes +else + ac_cv_func_getopt=no +fi +fi +rm -fr conftest* +fi +echo "$ac_t""$ac_cv_func_getopt" 1>&4 +test $ac_cv_func_getopt = no && LIBOBJS="$LIBOBJS getopt.o" + # generate output files trap '' 1 2 15 if test -w $cache_file; then @@ -2754,6 +2850,8 @@ s%@CC@%$CC%g s%@RANLIB@%$RANLIB%g s%@AR@%$AR%g s%@INSTALL@%$INSTALL%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_DATA@%$INSTALL_DATA%g s%@OPT@%$OPT%g s%@CPP@%$CPP%g s%@MACHDEP@%$MACHDEP%g