From 85ed7b0bfa1bf650766b2430dfbae078ef0f37ff Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 27 Oct 2020 18:43:53 -0300 Subject: [PATCH] libv3270 is now optional. --- Makefile.in | 10 +++------- configure.ac | 14 +++++++++++--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index 62cb801..da2f785 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,9 +27,7 @@ PACKAGE_NAME=@PACKAGE_NAME@ PRODUCT_NAME=@PRODUCT_NAME@ LIBNAME=libipc3270 - -CLIENT_TARGETS= \ - @CLIENT_TARGETS@ +PROJECT_MODULES=@PROJECT_MODULES@ #---[ Paths ]---------------------------------------------------------------------------- @@ -65,8 +63,7 @@ MSGCAT=@MSGCAT@ #---[ Release Targets ]------------------------------------------------------------------ all: \ - server \ - client \ + $(foreach MODULE, $(PROJECT_MODULES), $(MODULE)) \ locale/$(GETTEXT_PACKAGE).pot server: \ @@ -103,8 +100,7 @@ locale/$(GETTEXT_PACKAGE).pot: #---[ Install Targets ]------------------------------------------------------------------ install: \ - install-server \ - install-client \ + $(foreach MODULE, $(PROJECT_MODULES), install-$(MODULE)) \ install-locale install-locale: \ diff --git a/configure.ac b/configure.ac index 5a9c950..3afff54 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,7 @@ dnl --------------------------------------------------------------------------- CLIENT_LDFLAGS="" CLIENT_LIBS="" CLIENT_MODULES="library" +PROJECT_MODULES="client" dnl --------------------------------------------------------------------------- dnl Check for OS specifics @@ -187,8 +188,6 @@ if test "$app_cv_static" == "yes"; then CLIENT_MODULES="$CLIENT_MODULES static" fi -AC_SUBST(CLIENT_MODULES) - dnl --------------------------------------------------------------------------- dnl Check for libintl dnl --------------------------------------------------------------------------- @@ -265,11 +264,16 @@ dnl --------------------------------------------------------------------------- dnl Check for LIBV3270 dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES( [V3270], [libv3270], AC_DEFINE(HAVE_V3270), AC_MSG_ERROR([V3270 not present.])) +PKG_CHECK_MODULES( [V3270], [libv3270], app_cv_libv3270=yes, AC_MSG_NOTICE([V3270 not present.])) AC_SUBST(V3270_LIBS) AC_SUBST(V3270_CFLAGS) +if test "$app_cv_libv3270" == "yes"; then + AC_DEFINE(HAVE_V3270) + PROJECT_MODULES="$PROJECT_MODULES server" +fi + dnl --------------------------------------------------------------------------- dnl Check for GTK dnl --------------------------------------------------------------------------- @@ -450,9 +454,13 @@ dnl --------------------------------------------------------------------------- dnl Output the generated config.status script. dnl --------------------------------------------------------------------------- AC_SUBST(BASEDIR,$ac_pwd) + CFLAGS="$CFLAGS -DHAVE_CONFIG_H" CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H" +AC_SUBST(CLIENT_MODULES) +AC_SUBST(PROJECT_MODULES) + AC_OUTPUT -- libgit2 0.21.2