diff options
| author | Magnus Henoch <[email protected]> | 2016-09-28 15:48:07 +0100 |
|---|---|---|
| committer | Magnus Henoch <[email protected]> | 2016-09-28 15:48:07 +0100 |
| commit | e42f4b6fb934dc064699174da07027966698c79b (patch) | |
| tree | 103b9a1ce69a51d584ee5ed324f81c203cfa58dc | |
| parent | 7ba072b772ac1f7339a5869969120ce686227465 (diff) | |
| download | otp-e42f4b6fb934dc064699174da07027966698c79b.tar.gz otp-e42f4b6fb934dc064699174da07027966698c79b.tar.bz2 otp-e42f4b6fb934dc064699174da07027966698c79b.zip | |
Rename SSL_DEFINE to SSL_FLAGS
For consistency with other applications.
| -rw-r--r-- | erts/configure.in | 8 | ||||
| -rw-r--r-- | lib/crypto/c_src/Makefile.in | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/configure.in b/erts/configure.in index 3b18c499dc..8568b7c8ae 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -3905,7 +3905,7 @@ dnl use "PATH/include" and "PATH/lib". AC_SUBST(SSL_INCLUDE) AC_SUBST(SSL_INCDIR) AC_SUBST(SSL_LIBDIR) -AC_SUBST(SSL_DEFINE) +AC_SUBST(SSL_FLAGS) AC_SUBST(SSL_CRYPTO_LIBNAME) AC_SUBST(SSL_SSL_LIBNAME) AC_SUBST(SSL_CC_RUNTIME_LIBRARY_PATH) @@ -4611,13 +4611,13 @@ if test "x$enable_fips_support" = "xyes" && test "$CRYPTO_APP" != ""; then LDFLAGS="$LDFLAGS $SSL_LD_RUNTIME_LIBRARY_PATH -L$SSL_LIBDIR" LIBS="-lcrypto" AC_CHECK_FUNC([FIPS_mode_set], - [SSL_DEFINE="-DFIPS_SUPPORT"], - [SSL_DEFINE=]) + [SSL_FLAGS="-DFIPS_SUPPORT"], + [SSL_FLAGS=]) CFLAGS="$saveCFLAGS" LDFLAGS="$saveLDFLAGS" LIBS="$saveLIBS" else - SSL_DEFINE= + SSL_FLAGS= fi #-------------------------------------------------------------------- diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in index 1d1abca08e..af7c209c75 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -43,11 +43,11 @@ SSL_LIBDIR = @SSL_LIBDIR@ SSL_INCLUDE = @SSL_INCLUDE@ SSL_CRYPTO_LIBNAME = @SSL_CRYPTO_LIBNAME@ SSL_SSL_LIBNAME = @SSL_SSL_LIBNAME@ -SSL_DEFINE = @SSL_DEFINE@ +SSL_FLAGS = @SSL_FLAGS@ INCLUDES = $(SSL_INCLUDE) $(DED_INCLUDES) -CFLAGS += $(SSL_DEFINE) +CFLAGS += $(SSL_FLAGS) ifeq ($(TYPE),debug) TYPEMARKER = .debug |