Fix for AIX shared build, see RT#463.
authorAndy Polyakov <appro@openssl.org>
Sat, 18 Jan 2003 15:13:03 +0000 (15:13 +0000)
committerAndy Polyakov <appro@openssl.org>
Sat, 18 Jan 2003 15:13:03 +0000 (15:13 +0000)
Configure
config

index 77762cb2cdce64a44a5b9731a6916526b36c358b..3d74ceb1055857221fc3ab3f2a55a55bf79814c9 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -440,9 +440,9 @@ my %table=(
 # IBM's AIX.
 "aix-cc",   "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
 "aix-gcc",  "gcc:-O3 -DB_ENDIAN::(unknown):AIX::BN_LLONG RC4_CHAR:::",
 # IBM's AIX.
 "aix-cc",   "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
 "aix-gcc",  "gcc:-O3 -DB_ENDIAN::(unknown):AIX::BN_LLONG RC4_CHAR:::",
-"aix43-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",
+"aix43-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
 "aix43-gcc",  "gcc:-O1 -DAIX -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",
 "aix43-gcc",  "gcc:-O1 -DAIX -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",
-"aix64-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384 -q64::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR::::::::::dlfcn::::::-X 64",
+"aix64-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384 -q64::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR::::::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
 
 #
 # Cray T90 and similar (SDSC)
 
 #
 # Cray T90 and similar (SDSC)
diff --git a/config b/config
index fe8a441b286ebe3bb0e5757e5776e3db5bb059c8..e72b982288c5264e43fbdaafa2fc96f8c9770d5b 100755 (executable)
--- a/config
+++ b/config
@@ -464,6 +464,10 @@ if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
   fi
 fi
 
   fi
 fi
 
+if [ "${SYSTEM}" = "AIX" ]; then       # favor vendor cc over gcc
+    (cc) 2>&1 | grep -iv "command not found" > /dev/null && CC=cc
+fi
+
 CCVER=${CCVER:-0}
 
 # read the output of the embedded GuessOS 
 CCVER=${CCVER:-0}
 
 # read the output of the embedded GuessOS