Download as
Browse Code »

Commit 85ed7b0bfa1bf650766b2430dfbae078ef0f37ff

Authored by Perry Werneck
1 parent 1a733b16
Exists in master and in 1 other branch develop

libv3270 is now optional.

Showing 2 changed files with 14 additions and 10 deletions   Show diff stats
@@ -27,9 +27,7 @@ @@ -27,9 +27,7 @@
27 PACKAGE_NAME=@PACKAGE_NAME@ 27 PACKAGE_NAME=@PACKAGE_NAME@
28 PRODUCT_NAME=@PRODUCT_NAME@ 28 PRODUCT_NAME=@PRODUCT_NAME@
29 LIBNAME=libipc3270 29 LIBNAME=libipc3270
30 -  
31 -CLIENT_TARGETS= \  
32 - @CLIENT_TARGETS@ 30 +PROJECT_MODULES=@PROJECT_MODULES@
33 31
34 #---[ Paths ]---------------------------------------------------------------------------- 32 #---[ Paths ]----------------------------------------------------------------------------
35 33
@@ -65,8 +63,7 @@ MSGCAT=@MSGCAT@ @@ -65,8 +63,7 @@ MSGCAT=@MSGCAT@
65 #---[ Release Targets ]------------------------------------------------------------------ 63 #---[ Release Targets ]------------------------------------------------------------------
66 64
67 all: \ 65 all: \
68 - server \  
69 - client \ 66 + $(foreach MODULE, $(PROJECT_MODULES), $(MODULE)) \
70 locale/$(GETTEXT_PACKAGE).pot 67 locale/$(GETTEXT_PACKAGE).pot
71 68
72 server: \ 69 server: \
@@ -103,8 +100,7 @@ locale/$(GETTEXT_PACKAGE).pot: @@ -103,8 +100,7 @@ locale/$(GETTEXT_PACKAGE).pot:
103 #---[ Install Targets ]------------------------------------------------------------------ 100 #---[ Install Targets ]------------------------------------------------------------------
104 101
105 install: \ 102 install: \
106 - install-server \  
107 - install-client \ 103 + $(foreach MODULE, $(PROJECT_MODULES), install-$(MODULE)) \
108 install-locale 104 install-locale
109 105
110 install-locale: \ 106 install-locale: \
@@ -63,6 +63,7 @@ dnl --------------------------------------------------------------------------- @@ -63,6 +63,7 @@ dnl ---------------------------------------------------------------------------
63 CLIENT_LDFLAGS="" 63 CLIENT_LDFLAGS=""
64 CLIENT_LIBS="" 64 CLIENT_LIBS=""
65 CLIENT_MODULES="library" 65 CLIENT_MODULES="library"
  66 +PROJECT_MODULES="client"
66 67
67 dnl --------------------------------------------------------------------------- 68 dnl ---------------------------------------------------------------------------
68 dnl Check for OS specifics 69 dnl Check for OS specifics
@@ -187,8 +188,6 @@ if test "$app_cv_static" == "yes"; then @@ -187,8 +188,6 @@ if test "$app_cv_static" == "yes"; then
187 CLIENT_MODULES="$CLIENT_MODULES static" 188 CLIENT_MODULES="$CLIENT_MODULES static"
188 fi 189 fi
189 190
190 -AC_SUBST(CLIENT_MODULES)  
191 -  
192 dnl --------------------------------------------------------------------------- 191 dnl ---------------------------------------------------------------------------
193 dnl Check for libintl 192 dnl Check for libintl
194 dnl --------------------------------------------------------------------------- 193 dnl ---------------------------------------------------------------------------
@@ -265,11 +264,16 @@ dnl --------------------------------------------------------------------------- @@ -265,11 +264,16 @@ dnl ---------------------------------------------------------------------------
265 dnl Check for LIBV3270 264 dnl Check for LIBV3270
266 dnl --------------------------------------------------------------------------- 265 dnl ---------------------------------------------------------------------------
267 266
268 -PKG_CHECK_MODULES( [V3270], [libv3270], AC_DEFINE(HAVE_V3270), AC_MSG_ERROR([V3270 not present.])) 267 +PKG_CHECK_MODULES( [V3270], [libv3270], app_cv_libv3270=yes, AC_MSG_NOTICE([V3270 not present.]))
269 268
270 AC_SUBST(V3270_LIBS) 269 AC_SUBST(V3270_LIBS)
271 AC_SUBST(V3270_CFLAGS) 270 AC_SUBST(V3270_CFLAGS)
272 271
  272 +if test "$app_cv_libv3270" == "yes"; then
  273 + AC_DEFINE(HAVE_V3270)
  274 + PROJECT_MODULES="$PROJECT_MODULES server"
  275 +fi
  276 +
273 dnl --------------------------------------------------------------------------- 277 dnl ---------------------------------------------------------------------------
274 dnl Check for GTK 278 dnl Check for GTK
275 dnl --------------------------------------------------------------------------- 279 dnl ---------------------------------------------------------------------------
@@ -450,9 +454,13 @@ dnl --------------------------------------------------------------------------- @@ -450,9 +454,13 @@ dnl ---------------------------------------------------------------------------
450 dnl Output the generated config.status script. 454 dnl Output the generated config.status script.
451 dnl --------------------------------------------------------------------------- 455 dnl ---------------------------------------------------------------------------
452 AC_SUBST(BASEDIR,$ac_pwd) 456 AC_SUBST(BASEDIR,$ac_pwd)
  457 +
453 CFLAGS="$CFLAGS -DHAVE_CONFIG_H" 458 CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
454 CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H" 459 CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H"
455 460
  461 +AC_SUBST(CLIENT_MODULES)
  462 +AC_SUBST(PROJECT_MODULES)
  463 +
456 AC_OUTPUT 464 AC_OUTPUT
457 465
458 466