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
Makefile.in
  Diff comments   View file @85ed7b0
... ... @@ -27,9 +27,7 @@
27 27 PACKAGE_NAME=@PACKAGE_NAME@
28 28 PRODUCT_NAME=@PRODUCT_NAME@
29 29 LIBNAME=libipc3270
30   -
31   -CLIENT_TARGETS= \
32   - @CLIENT_TARGETS@
  30 +PROJECT_MODULES=@PROJECT_MODULES@
33 31  
34 32 #---[ Paths ]----------------------------------------------------------------------------
35 33  
... ... @@ -65,8 +63,7 @@ MSGCAT=@MSGCAT@
65 63 #---[ Release Targets ]------------------------------------------------------------------
66 64  
67 65 all: \
68   - server \
69   - client \
  66 + $(foreach MODULE, $(PROJECT_MODULES), $(MODULE)) \
70 67 locale/$(GETTEXT_PACKAGE).pot
71 68  
72 69 server: \
... ... @@ -103,8 +100,7 @@ locale/$(GETTEXT_PACKAGE).pot:
103 100 #---[ Install Targets ]------------------------------------------------------------------
104 101  
105 102 install: \
106   - install-server \
107   - install-client \
  103 + $(foreach MODULE, $(PROJECT_MODULES), install-$(MODULE)) \
108 104 install-locale
109 105  
110 106 install-locale: \
... ...
configure.ac
  Diff comments   View file @85ed7b0
... ... @@ -63,6 +63,7 @@ dnl ---------------------------------------------------------------------------
63 63 CLIENT_LDFLAGS=""
64 64 CLIENT_LIBS=""
65 65 CLIENT_MODULES="library"
  66 +PROJECT_MODULES="client"
66 67  
67 68 dnl ---------------------------------------------------------------------------
68 69 dnl Check for OS specifics
... ... @@ -187,8 +188,6 @@ if test "$app_cv_static" == "yes"; then
187 188 CLIENT_MODULES="$CLIENT_MODULES static"
188 189 fi
189 190  
190   -AC_SUBST(CLIENT_MODULES)
191   -
192 191 dnl ---------------------------------------------------------------------------
193 192 dnl Check for libintl
194 193 dnl ---------------------------------------------------------------------------
... ... @@ -265,11 +264,16 @@ dnl ---------------------------------------------------------------------------
265 264 dnl Check for LIBV3270
266 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 269 AC_SUBST(V3270_LIBS)
271 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 277 dnl ---------------------------------------------------------------------------
274 278 dnl Check for GTK
275 279 dnl ---------------------------------------------------------------------------
... ... @@ -450,9 +454,13 @@ dnl ---------------------------------------------------------------------------
450 454 dnl Output the generated config.status script.
451 455 dnl ---------------------------------------------------------------------------
452 456 AC_SUBST(BASEDIR,$ac_pwd)
  457 +
453 458 CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
454 459 CXXFLAGS="$CXXFLAGS -DHAVE_CONFIG_H"
455 460  
  461 +AC_SUBST(CLIENT_MODULES)
  462 +AC_SUBST(PROJECT_MODULES)
  463 +
456 464 AC_OUTPUT
457 465  
458 466  
... ...