From 314d3de2eaff797fa3dea81ca8ab9c546cb15698 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 8 Aug 2019 09:32:13 -0300
Subject: [PATCH] Adding lib3270 options on the v3270 configuration.

---
 Makefile.in        |  4 ++--
 configure.ac       | 47 ++++++++++++++++-------------------------------
 libv3270.pc.in     | 16 ----------------
 sdk/libv3270.pc.in | 14 ++++++++++++++
 4 files changed, 32 insertions(+), 49 deletions(-)
 delete mode 100644 libv3270.pc.in
 create mode 100644 sdk/libv3270.pc.in

diff --git a/Makefile.in b/Makefile.in
index 509becc..fee1c49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,7 +27,7 @@
 #---[ Library configuration ]------------------------------------------------------------
 
 SONAME=@SONAME@
-LIBNAME=libv@LIB3270_NAME@
+LIBNAME=libv3270
 
 SOURCES= \
 	$(wildcard src/terminal/*.c) \
@@ -320,7 +320,7 @@ install-dev: \
 	# Install PKG-CONFIG files
 	@mkdir -p $(DESTDIR)$(libdir)/pkgconfig
 	@$(INSTALL_DATA) \
-		libv3270.pc \
+		sdk/libv3270.pc \
 		$(DESTDIR)$(libdir)/pkgconfig/libv3270.pc
 
 	# Install translation files
diff --git a/configure.ac b/configure.ac
index 3621b89..79cafa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,21 @@ AC_SUBST(RPQ_REVISION,$rpq_revision)
 AC_SUBST(SCCS_USER,$USER)
 AC_SUBST(SCCS_DATE,$sccs_date)
 
+case "$host" in
+	*-mingw32|*-pc-msys)
+		AC_SUBST(SONAME,libv3270.dll)
+		;;
+
+ 	s390x-*)
+		AC_SUBST(SONAME,libv3270.so)
+		;;
+
+ 	*)
+		AC_SUBST(SONAME,libv3270.so.$app_vrs_major.$app_vrs_minor)
+
+esac
+
+
 dnl ---------------------------------------------------------------------------
 dnl Check for libm (Required for spinner)
 dnl ---------------------------------------------------------------------------
@@ -285,36 +300,6 @@ if test "$app_cv_pic" == "yes"; then
 fi
 
 dnl ---------------------------------------------------------------------------
-dnl Lib3270 flags
-dnl ---------------------------------------------------------------------------
-
-
-AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
-
-AC_DEFINE(LIB3270_NAME,$app_cv_libname)
-AC_SUBST(LIB3270_NAME,$app_cv_libname)
-
-
-case "$host" in
-	*-mingw32|*-pc-msys)
-		AC_SUBST(SONAME,libv$app_cv_libname.dll)
-		;;
-
- 	s390x-*)
-		AC_SUBST(SONAME,libv$app_cv_libname.so)
-		;;
-
- 	*)
-		AC_SUBST(SONAME,libv$app_cv_libname.so.$app_vrs_major.$app_vrs_minor)
-
-esac
-
-AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library version for SDK])], [ app_cv_sdkversion="$withval" ],[ app_cv_sdkversion=$VERSION ])
-
-AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion)
-AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion)
-
-dnl ---------------------------------------------------------------------------
 dnl Check for headers
 dnl ---------------------------------------------------------------------------
 
@@ -356,7 +341,7 @@ dnl Configure which files to generate.
 dnl ---------------------------------------------------------------------------
 
 AC_CONFIG_FILES(Makefile)
-AC_CONFIG_FILES(libv3270.pc)
+AC_CONFIG_FILES(sdk/libv3270.pc)
 AC_CONFIG_FILES(glade/v3270.xml)
 
 dnl ---------------------------------------------------------------------------
diff --git a/libv3270.pc.in b/libv3270.pc.in
deleted file mode 100644
index b7846c7..0000000
--- a/libv3270.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-version_major=@PACKAGE_MAJOR_VERSION@
-version_minor=@PACKAGE_MINOR_VERSION@
-sdk_version=@LIB3270_SDK_VERSION@
-
-Name: @PACKAGE_NAME@
-Description: @PACKAGE_DESCRIPTION@
-Version: @PACKAGE_VERSION@
-Libs: -L\@libdir@ -lv@LIB3270_NAME@
-Libs.private: -l@LIB3270_NAME@
-Cflags: -I@includedir@
-
diff --git a/sdk/libv3270.pc.in b/sdk/libv3270.pc.in
new file mode 100644
index 0000000..22df366
--- /dev/null
+++ b/sdk/libv3270.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+version_major=@PACKAGE_MAJOR_VERSION@
+version_minor=@PACKAGE_MINOR_VERSION@
+
+Name: @PACKAGE_NAME@
+Description: @PACKAGE_DESCRIPTION@
+Version: @PACKAGE_VERSION@
+Libs: -L\@libdir@ -lv3270 @LIB3270_LIBS@
+Cflags: -I@includedir@
+
--
libgit2 0.21.2