From 880e560996d4839dcb7a2d1de7f912b332779de2 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 3 Jul 2019 09:43:54 -0300
Subject: [PATCH] Static library build is now optional and defaults only for windows.

---
 Makefile.in  |  6 +++---
 configure.ac | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 18d777c..cdcb33d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,6 +27,8 @@
 MODULES= \
 	lib@LIB3270_NAME@@DLLEXT@
 
+INSTALL_PACKAGES=@INSTALL_PACKAGES@
+
 #---[ Tools ]----------------------------------------------------------------------------
 
 MKDIR=@MKDIR_P@
@@ -155,9 +157,7 @@ doc:
 #---[ Install Targets ]------------------------------------------------------------------
 
 install: \
-	install-shared \
-	install-static \
-	install-dev
+	$(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG))
 
 install-shared:
 	@$(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270 $@
diff --git a/configure.ac b/configure.ac
index fbe1633..31c5cc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ APP_RESOURCES=""
 APP_LDFLAGS=""
 DLL_LDFLAGS="-shared -Wl,-soname,\$(@F)"
 STATIC_LDFLAGS=""
+INSTALL_PACKAGES="shared dev"
 
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
@@ -88,6 +89,9 @@ case "$host" in
 
 		AC_CONFIG_FILES(src/lib3270/windows/resources.rc)
 		AC_CONFIG_FILES(src/lib3270++/windows/resources.rc)
+
+		app_cv_static='yes'
+
 		;;
 
  	s390x-*)
@@ -97,6 +101,9 @@ case "$host" in
 		app_cv_confdir="/etc"
 		app_cv_osname="linux"
 		LOGDIR="/var/log"
+
+		app_cv_static='no'
+
 		;;
 
  	*)
@@ -108,6 +115,8 @@ case "$host" in
 		LOGDIR="/var/log"
 		DLLEXT=".so"
 
+		app_cv_static='no'
+
 esac
 
 AC_DEFINE_UNQUOTED(LIB3270_DATADIR,$app_cv_datadir)
@@ -434,6 +443,22 @@ AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion)
 
 AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])], [ AC_DEFINE_UNQUOTED(LIB3270_DEFAULT_HOST,"$withval") ],[ AC_MSG_NOTICE(No default host)])
 
+AC_ARG_ENABLE([static],
+ 	[AS_HELP_STRING([--enable-static], [Enable build and install the static library])],
+[
+ 	app_cv_static="$enableval"
+],[
+	AC_MSG_NOTICE([Keep default selection for static library.])
+])
+
+if test "$app_cv_expired_crl" == "yes"; then
+	AC_DEFINE(SSL_ENABLE_CRL_EXPIRATION_CHECK)
+fi
+
+if test "$app_cv_static" == "yes"; then
+	INSTALL_PACKAGES="$INSTALL_PACKAGES static"
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl Check for headers
 dnl ---------------------------------------------------------------------------
@@ -554,6 +579,8 @@ dnl ---------------------------------------------------------------------------
 dnl Configure which files to generate.
 dnl ---------------------------------------------------------------------------
 
+AC_SUBST(INSTALL_PACKAGES)
+
 AC_CONFIG_FILES(Makefile)
 
 AC_CONFIG_FILES(src/lib3270/Makefile)
--
libgit2 0.21.2