From f5c19b66fd833be7253408205522135d41712973 Mon Sep 17 00:00:00 2001
From: David Ward <david.ward@ll.mit.edu>
Date: Sat, 11 Apr 2020 10:09:27 -0400
Subject: [PATCH] Fix final output from ./configure

AC_OUTPUT needs to be called before the final output is printed.
---
 ccid/configure.ac             | 20 +++++-----
 pcsc-relay/configure.ac       | 21 +++++-----
 virtualsmartcard/configure.ac | 75 +++++++++++++++++------------------
 3 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/ccid/configure.ac b/ccid/configure.ac
index 55391bc..1bfb8a3 100644
--- a/ccid/configure.ac
+++ b/ccid/configure.ac
@@ -95,6 +95,15 @@ AC_FUNC_REALLOC
 AC_FUNC_STRNLEN
 AC_CHECK_FUNCS([memmove memset strerror strtol])
 
+
+AC_CONFIG_FILES([
+                 Makefile
+                 src/Makefile
+                 doc/Makefile
+                 ])
+
+AC_OUTPUT
+
 cat << EOF
 
 ${PACKAGE} has been configured with following options:
@@ -104,29 +113,20 @@ User binaries:        $(eval eval eval echo "${bindir}")
 Libraries:            $(eval eval eval echo "${libdir}")
 Configuration files:  $(eval eval eval echo "${sysconfdir}")
 
-
 Host:                 ${host}
 Compiler:             ${CC}
 Preprocessor flags:   ${CPPFLAGS}
 Compiler flags:       ${CFLAGS}
-Preprocessor flags:   ${CPPFLAGS}
 Linker flags:         ${LDFLAGS}
 Libraries:            ${LIBS}
+
 PTHREAD_CFLAGS:       ${PTHREAD_CFLAGS}
 PTHREAD_LIBS:         ${PTHREAD_LIBS}
 OPENSC_LIBS:          ${OPENSC_LIBS}
 OPENSSL_CFLAGS:       ${OPENSSL_CFLAGS}
 OPENSSL_LIBS:         ${OPENSSL_LIBS}
 
-
 HELP2MAN:             ${HELP2MAN}
 GENGETOPT:            ${GENGETOPT}
 
 EOF
-
-AC_CONFIG_FILES([
-                 Makefile
-                 src/Makefile
-                 doc/Makefile
-                 ])
-AC_OUTPUT
diff --git a/pcsc-relay/configure.ac b/pcsc-relay/configure.ac
index c8dbf49..e15b879 100644
--- a/pcsc-relay/configure.ac
+++ b/pcsc-relay/configure.ac
@@ -160,6 +160,13 @@ AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 
 
+AC_CONFIG_FILES([Makefile
+                 doc/Makefile
+                 win32/Makefile
+                 src/Makefile])
+
+AC_OUTPUT
+
 cat << EOF
 
 pcsc-relay has been configured with following options:
@@ -168,13 +175,15 @@ Version:              ${PACKAGE_VERSION}
 User binaries:        $(eval eval eval echo "${bindir}")
 Enable libnfc:        ${enable_libnfc}
 
+OpenPICC device:      ${piccdev}
+
 Host:                 ${host}
 Compiler:             ${CC}
 Preprocessor flags:   ${CPPFLAGS}
 Compiler flags:       ${CFLAGS}
-Preprocessor flags:   ${CPPFLAGS}
 Linker flags:         ${LDFLAGS}
 Libraries:            ${LIBS}
+
 PTHREAD_LIBS:         ${PTHREAD_LIBS}
 PTHREAD_CFLAGS:       ${PTHREAD_CFLAGS}
 PCSC_CFLAGS:          ${PCSC_CFLAGS}
@@ -182,17 +191,7 @@ PCSC_LIBS:            ${PCSC_LIBS}
 LIBNFC_CFLAGS:        ${LIBNFC_CFLAGS}
 LIBNFC_LIBS:          ${LIBNFC_LIBS}
 
-OpenPICC device:      ${piccdev}
-
-
 HELP2MAN:             ${HELP2MAN}
 GENGETOPT:            ${GENGETOPT}
 
 EOF
-
-
-AC_CONFIG_FILES([Makefile
-                 doc/Makefile
-                 win32/Makefile
-                 src/Makefile])
-AC_OUTPUT
diff --git a/virtualsmartcard/configure.ac b/virtualsmartcard/configure.ac
index 24281ad..d6b83b0 100644
--- a/virtualsmartcard/configure.ac
+++ b/virtualsmartcard/configure.ac
@@ -265,44 +265,6 @@ case "$host" in
 	LIB_PREFIX="lib"
 esac
 
-cat << EOF
-
-${PACKAGE} has been configured with following options:
-
-Version:              ${PACKAGE_VERSION}
-User binaries:        $(eval eval eval echo "${bindir}")
-PC/SC configuration:  ${serialconfdir}
-Driver directory:     ${serialdropdir}
-Python site-packages: $(eval eval eval echo "${pythondir}")
-
-Build libpcsclite:    ${libpcsclite}
-Build Info.plist:     ${infoplist}
-Build reader.conf:    ${readerconf}
-VPCD hostname: 	      ${vpcdhost}
-VPCD slot count:      ${vpcdslots}
-
-
-Host:                 ${host}
-Compiler:             ${CC}
-Preprocessor flags:   ${CPPFLAGS}
-Compiler flags:       ${CFLAGS}
-Preprocessor flags:   ${CPPFLAGS}
-Linker flags:         ${LDFLAGS}
-Libraries:            ${LIBS}
-PTHREAD_LIBS:         ${PTHREAD_LIBS}
-PTHREAD_CFLAGS:       ${PTHREAD_CFLAGS}
-PCSC_CFLAGS:          ${PCSC_CFLAGS}
-PCSC_LIBS:            ${PCSC_LIBS}
-QRENCODE_CFLAGS:      ${QRENCODE_CFLAGS}
-QRENCODE_LIBS:        ${QRENCODE_LIBS}
-BUNDLE_HOST:          ${BUNDLE_HOST}
-LIB_PREFIX:           ${LIB_PREFIX}
-DYN_LIB_EXT:          ${DYN_LIB_EXT}
-
-
-HELP2MAN:             ${HELP2MAN}
-
-EOF
 
 AC_CONFIG_FILES([Makefile
                  doc/Makefile
@@ -319,3 +281,40 @@ AC_CONFIG_FILES([Makefile
                  MacOSX/Makefile
                  ])
 AC_OUTPUT
+
+cat << EOF
+
+${PACKAGE} has been configured with following options:
+
+Version:              ${PACKAGE_VERSION}
+User binaries:        $(eval eval eval echo "${bindir}")
+PC/SC configuration:  ${serialconfdir}
+Driver directory:     ${serialdropdir}
+Python site-packages: $(eval eval eval echo "${pythondir}")
+
+Build libpcsclite:    ${libpcsclite}
+Build Info.plist:     ${infoplist}
+Build reader.conf:    ${readerconf}
+VPCD hostname: 	      ${vpcdhost}
+VPCD slot count:      ${vpcdslots}
+
+Host:                 ${host}
+Compiler:             ${CC}
+Preprocessor flags:   ${CPPFLAGS}
+Compiler flags:       ${CFLAGS}
+Linker flags:         ${LDFLAGS}
+Libraries:            ${LIBS}
+
+PTHREAD_LIBS:         ${PTHREAD_LIBS}
+PTHREAD_CFLAGS:       ${PTHREAD_CFLAGS}
+PCSC_CFLAGS:          ${PCSC_CFLAGS}
+PCSC_LIBS:            ${PCSC_LIBS}
+QRENCODE_CFLAGS:      ${QRENCODE_CFLAGS}
+QRENCODE_LIBS:        ${QRENCODE_LIBS}
+BUNDLE_HOST:          ${BUNDLE_HOST}
+LIB_PREFIX:           ${LIB_PREFIX}
+DYN_LIB_EXT:          ${DYN_LIB_EXT}
+
+HELP2MAN:             ${HELP2MAN}
+
+EOF