Make it possible to override CRYPTO_IMPL_CFLAGS and CRYPTO_IMPL_LIBS at

make time.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24469 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 3749a15a68beb270ebdedfff645ef0c55d3bf033..a1d0eb747b72cb0669bd8a01235f6489027636d8 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -49,8 +49,10 @@ SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST                              \
 # No dependencies.  Record places to find this shared object if the target
 # link editor and loader support it.
 DEPLIBS=
+CRYPTO_LIBS=@CRYPTO_LIBS@
+CRYPTO_IMPL_LIBS=@CRYPTO_IMPL_LIBS@
 SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_EXPLIBS= $(SUPPORT_LIB) @CRYPTO_LIBS@ @CRYPTO_IMPL_LIBS@ $(LIBS)
+SHLIB_EXPLIBS= $(SUPPORT_LIB) $(CRYPTO_LIBS) $(CRYPTO_IMPL_LIBS) $(LIBS)
 SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@

diff --git a/src/lib/crypto/krb/prng/nss/Makefile.in b/src/lib/crypto/krb/prng/nss/Makefile.in
index 66b0893830ef93f498122a1d0a28dce13cd5ab21..04fbd1957a962f9f456c9039ac4e87767a766a51 100644 (file)
--- a/src/lib/crypto/krb/prng/nss/Makefile.in
+++ b/src/lib/crypto/krb/prng/nss/Makefile.in
@@ -1,7 +1,8 @@
 mydir=lib/crypto/krb/prng/nss
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
-               -I$(srcdir)/../../../@CRYPTO_IMPL@ @CRYPTO_IMPL_CFLAGS@
+               -I$(srcdir)/../../../@CRYPTO_IMPL@ $(CRYPTO_IMPL_CFLAGS)
 DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in
index c50a74a84d75e2d6eaf4d592aef07ea5193127b4..7ce3cc8a9f625968d9b817ecfcf1256fba9e7da9 100644 (file)
--- a/src/lib/crypto/nss/Makefile.in
+++ b/src/lib/crypto/nss/Makefile.in
@@ -1,6 +1,7 @@
 mydir=lib/crypto/nss
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=des aes        camellia md4 md5  sha1 sha2 enc_provider hash_provider
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../krb                     \
                -I$(srcdir)/../krb/hash_provider        \
                -I$(srcdir)/des         \
@@ -11,7 +12,7 @@ LOCALINCLUDES = -I$(srcdir)/../krb                    \
                -I$(srcdir)/md5 \
                -I$(srcdir)/enc_provider        \
                -I$(srcdir)/hash_provider       \
-               @CRYPTO_IMPL_CFLAGS@
+               $(CRYPTO_IMPL_CFLAGS)
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)

diff --git a/src/lib/crypto/nss/des/Makefile.in b/src/lib/crypto/nss/des/Makefile.in
index d97fcfbd890180c83c536a0ac070842fcd1bbc6a..dc0e5e8eed6c23402afc56d9d437f8bdd0e74412 100644 (file)
--- a/src/lib/crypto/nss/des/Makefile.in
+++ b/src/lib/crypto/nss/des/Makefile.in
@@ -1,6 +1,8 @@
 mydir=lib/crypto/nss/des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb @CRYPTO_IMPL_CFLAGS@
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \
+       $(CRYPTO_IMPL_CFLAGS)
 
 DEFS=
 

diff --git a/src/lib/crypto/nss/enc_provider/Makefile.in b/src/lib/crypto/nss/enc_provider/Makefile.in
index c7950d642b480477f7965247cc274980785d0bad..f1ed5fb06ad9bb25c210a96a353709c652c8eca1 100644 (file)
--- a/src/lib/crypto/nss/enc_provider/Makefile.in
+++ b/src/lib/crypto/nss/enc_provider/Makefile.in
@@ -1,12 +1,13 @@
 mydir=lib/crypto/nss/enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../des     \
                -I$(srcdir)/../arcfour \
                -I$(srcdir)/../aes      \
                -I$(srcdir)/../../krb                   \
                -I$(srcdir)/../../krb/rand2key          \
                -I$(srcdir)/.. -I$(srcdir)/.  \
-               @CRYPTO_IMPL_CFLAGS@
+               $(CRYPTO_IMPL_CFLAGS)
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..

diff --git a/src/lib/crypto/nss/hash_provider/Makefile.in b/src/lib/crypto/nss/hash_provider/Makefile.in
index 2530559d9e09abac1d996ebdbad08ebf5b211460..36ba7b2df32a087753c184166557d20c10a65547 100644 (file)
--- a/src/lib/crypto/nss/hash_provider/Makefile.in
+++ b/src/lib/crypto/nss/hash_provider/Makefile.in
@@ -1,8 +1,9 @@
 mydir=lib/crypto/nss/hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
        -I$(srcdir)/.. -I$(srcdir)/../../krb \
-       @CRYPTO_IMPL_CFLAGS@
+       $(CRYPTO_IMPL_CFLAGS)
 
 DEFS=
 

diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in
index 94a9e54375a1d2ac35b467dbb241a7c9c15d197c..83699a3f1a588d3f4b8f9b988ccd3f15e65ffea0 100644 (file)
--- a/src/lib/crypto/nss/md5/Makefile.in
+++ b/src/lib/crypto/nss/md5/Makefile.in
@@ -8,7 +8,8 @@ DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
-LOCALINCLUDES = -I$(srcdir)/.. @CRYPTO_IMPL_CFLAGS@
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
+LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
 
 STLIBOBJS= md5.o

diff --git a/src/lib/crypto/nss/sha1/Makefile.in b/src/lib/crypto/nss/sha1/Makefile.in
index a7cb6e824c9433d427d1dc3325945293bb9a806a..7afeb3813a60af1f57b77db695964607c7492257 100644 (file)
--- a/src/lib/crypto/nss/sha1/Makefile.in
+++ b/src/lib/crypto/nss/sha1/Makefile.in
@@ -1,7 +1,8 @@
 mydir=lib/crypto/nss/sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
-LOCALINCLUDES = -I$(srcdir)/.. @CRYPTO_IMPL_CFLAGS@
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
+LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR=sha1

diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in
index b42462eb20b241277f1fa6264c4d5debe72ad217..c0605e8de0c3d5a8e95875fddc59523d1dbf011b 100644 (file)
--- a/src/lib/crypto/nss/sha2/Makefile.in
+++ b/src/lib/crypto/nss/sha2/Makefile.in
@@ -1,7 +1,8 @@
 mydir=lib/crypto/nss/sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
-LOCALINCLUDES = -I$(srcdir)/.. @CRYPTO_IMPL_CFLAGS@
+CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
+LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
 ##DOS##BUILDTOP = ..\..\..\..
 ##DOS##PREFIXDIR=sha1