Switch around OPT assignments in Don Beaudry's patch for Olimit (his
code had the assignments switched around).
Also rename sharedmodules to lib-dynload.
diff --git a/configure b/configure
index bc775d1..6573f4a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
-# From configure.in Revision: 1.68
+# From configure.in Revision: 1.69
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.12
@@ -1134,7 +1134,7 @@
echo "$ac_t""$ac_cv_olimit_ok" 1>&6
if test $ac_cv_olimit_ok = yes; then
- OPT="$OPT -OPT:Olimit=0"
+ OPT="$OPT -Olimit 1500"
fi
echo $ac_n "checking whether $CC accepts -OPT:Olimit=0""... $ac_c" 1>&6
@@ -1169,7 +1169,7 @@
echo "$ac_t""$ac_cv_opt_olimit_ok" 1>&6
if test $ac_cv_olimit_ok = yes; then
- OPT="$OPT -Olimit 1500"
+ OPT="$OPT -OPT:Olimit=0"
fi
# check for ANSI or K&R ("traditional") preprocessor
@@ -1862,7 +1862,7 @@
case $ac_sys_system/$ac_sys_release in
AIX*) LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
hp*|HP*)
- LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/sharedmodules";;
+ LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
Linux*) LINKFORSHARED="-rdynamic";;
next/*) LINKFORSHARED="-u libsys_s";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
diff --git a/configure.in b/configure.in
index 4d7a77e..0048e1c 100644
--- a/configure.in
+++ b/configure.in
@@ -190,7 +190,7 @@
CC="$ac_save_cc"])
AC_MSG_RESULT($ac_cv_olimit_ok)
if test $ac_cv_olimit_ok = yes; then
- OPT="$OPT -OPT:Olimit=0"
+ OPT="$OPT -Olimit 1500"
fi
AC_MSG_CHECKING(whether $CC accepts -OPT:Olimit=0)
@@ -203,7 +203,7 @@
CC="$ac_save_cc"])
AC_MSG_RESULT($ac_cv_opt_olimit_ok)
if test $ac_cv_olimit_ok = yes; then
- OPT="$OPT -Olimit 1500"
+ OPT="$OPT -OPT:Olimit=0"
fi
# check for ANSI or K&R ("traditional") preprocessor
@@ -310,7 +310,7 @@
case $ac_sys_system/$ac_sys_release in
AIX*) LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
hp*|HP*)
- LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/sharedmodules";;
+ LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
Linux*) LINKFORSHARED="-rdynamic";;
next/*) LINKFORSHARED="-u libsys_s";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;