Code to avoid the use of non-standard strptime(). By

[openssl.git] / Configure

diff --git a/Configure b/Configure
index c7cee4b2564d7a6b74cbe413ce9f781dd60b338a..b20e663328e44f40c79dd41b7a77948384c5a7de 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -133,7 +133,7 @@ my %table=(
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
 "debug-bodo",  "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
 "debug-ulf",   "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -m486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
+"debug-steve", "gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -m486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -m486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -m486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "dist",                "cc:-O::(unknown)::::::",
@@ -453,10 +453,13 @@ my %table=(
 ##### GNU Hurd
 "hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
 
+##### OS/2 EMX
+"OS2-EMX", "gcc::::::::",
+
 );
 
 my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
-       BC-16 Mingw32);
+       BC-16 Mingw32 OS2-EMX);
 
 my $prefix="";
 my $openssldir="";
@@ -720,6 +723,7 @@ if ($no_krb5
        }
 else
        {
+       my ($lresolv, $lpath, $lext);
        if ($withargs{"krb5-flavor"} =~ /^[Hh]eimdal$/)
                {
                $withargs{"krb5-dir"} = "/usr/heimdal"
@@ -729,7 +733,7 @@ else
                        if $withargs{"krb5-lib"} eq "";
                $cflags="-DKRB5_HEIMDAL $cflags";
                }
-       if ($withargs{"krb5-flavor"} =~ /^[Mm][Ii][Tt]$/)
+       if ($withargs{"krb5-flavor"} =~ /^[Mm][Ii][Tt]/)
                {
                $withargs{"krb5-dir"} = "/usr/kerberos"
                        if $withargs{"krb5-dir"} eq "";
@@ -737,9 +741,27 @@ else
                        "/lib -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto"
                        if $withargs{"krb5-lib"} eq "";
                $cflags="-DKRB5_MIT $cflags";
+               $withargs{"krb5-flavor"} =~ s/^[Mm][Ii][Tt][._-]*//;
+               if ($withargs{"krb5-flavor"} =~ /^1[._-]*[01]/)
+                       {
+                       $cflags="-DKRB5_MIT_OLD11 $cflags";
+                       }
+               }
+       LRESOLV:
+       foreach $lpath ("/lib", "/usr/lib")
+               {
+               foreach $lext ("a", "so")
+                       {
+                       $lresolv = "$lpath/libresolv.$lext";
+                       last LRESOLV    if (-r "$lresolv");
+                       $lresolv = "";
+                       }
                }
+       $withargs{"krb5-lib"} .= " -lresolv"
+               if ("$lresolv");
        $withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"
-               if $withargs{"krb5-include"} eq "" && $withargs{"krb5-dir"} ne "";
+               if $withargs{"krb5-include"} eq "" &&
+                  $withargs{"krb5-dir"} ne "";
        }
 
 # The DSO code currently always implements all functions so that no