[pkg-opensc-commit] [opensc] 203/295: Move SM test in configure.ac after LIB_PRE and DYN_LIB_EXT assignment

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository opensc.

commit 20f781de282fbfcf9941d241d36584f6572a7458
Author: Maciej S. Szmigiero <mail at maciej.szmigiero.name>
Date:   Sat Oct 22 23:49:04 2016 +0200

    Move SM test in configure.ac after LIB_PRE and DYN_LIB_EXT assignment
    
    SM test in configure.ac makes use of LIB_PRE and DYN_LIB_EXT variables so
    let's move it further down in this file, just after these variables are
    assigned.
    
    Signed-off-by: Maciej S. Szmigiero <mail at maciej.szmigiero.name>
---
 configure.ac | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9906c16..2cade9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -643,25 +643,6 @@ else
 	OPENPACE_LIBS=""
 fi
 
-
-
-if test "${enable_sm}" = "yes"; then
-	AC_DEFINE([ENABLE_SM], [1], [Enable secure messaging support])
-
-	DEFAULT_SM_MODULE="${LIB_PRE}smm-local${DYN_LIB_EXT}"
-	case "${host}" in
-		*-mingw*|*-winnt*|*-cygwin*)
-			DEFAULT_SM_MODULE_PATH="\# module_path = \"\";"
-		;;
-		*)
-			DEFAULT_SM_MODULE="libsmm-local.so"
-			DEFAULT_SM_MODULE_PATH="module_path = \$(libdir);"
-		;;
-	esac
-	AC_DEFINE_UNQUOTED([DEFAULT_SM_MODULE], ["${DEFAULT_SM_MODULE}"], [Default SM module])
-	AC_DEFINE_UNQUOTED([DEFAULT_SM_MODULE_PATH], ["${DEFAULT_SM_MODULE_PATH}"], [Default SM module path])
-fi
-
 if test "${enable_openct}" = "yes"; then
 	PKG_CHECK_MODULES(
 		[OPENCT],
@@ -740,6 +721,22 @@ case "${host}" in
 		;;
 esac
 
+if test "${enable_sm}" = "yes"; then
+	AC_DEFINE([ENABLE_SM], [1], [Enable secure messaging support])
+
+	DEFAULT_SM_MODULE="${LIB_PRE}smm-local${DYN_LIB_EXT}"
+	case "${host}" in
+		*-mingw*|*-winnt*|*-cygwin*)
+			DEFAULT_SM_MODULE_PATH="\# module_path = \"\";"
+		;;
+		*)
+			DEFAULT_SM_MODULE="libsmm-local.so"
+			DEFAULT_SM_MODULE_PATH="module_path = \$(libdir);"
+		;;
+	esac
+	AC_DEFINE_UNQUOTED([DEFAULT_SM_MODULE], ["${DEFAULT_SM_MODULE}"], [Default SM module])
+	AC_DEFINE_UNQUOTED([DEFAULT_SM_MODULE_PATH], ["${DEFAULT_SM_MODULE_PATH}"], [Default SM module path])
+fi
 
 if test "${with_pkcs11_provider}" = "detect"; then
 	DEFAULT_PKCS11_PROVIDER="opensc-pkcs11${DYN_LIB_EXT}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git