Commit 2bf7c0c15013038c971e0de027e5308bd0486484
1 parent
34c471f0
Exists in
master
and in
2 other branches
Small adjustments on package and sdk.
Showing
4 changed files
with
8 additions
and
3 deletions
Show diff stats
Makefile.in
@@ -91,7 +91,7 @@ BASEDIR=@BASEDIR@ | @@ -91,7 +91,7 @@ BASEDIR=@BASEDIR@ | ||
91 | 91 | ||
92 | POTDIR=$(BASEDIR)/.pot | 92 | POTDIR=$(BASEDIR)/.pot |
93 | 93 | ||
94 | -OBJDIR=$(BASEDIR)/.obj/$(LIBNAME) | 94 | +OBJDIR=$(BASEDIR)/.obj |
95 | OBJDBG=$(OBJDIR)/Debug | 95 | OBJDBG=$(OBJDIR)/Debug |
96 | OBJRLS=$(OBJDIR)/Release | 96 | OBJRLS=$(OBJDIR)/Release |
97 | 97 |
configure.ac
@@ -519,8 +519,11 @@ AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion,[The SDK version number]) | @@ -519,8 +519,11 @@ AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion,[The SDK version number]) | ||
519 | AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion) | 519 | AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion) |
520 | 520 | ||
521 | AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])], | 521 | AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])], |
522 | - [ AC_DEFINE_UNQUOTED(LIB3270_DEFAULT_HOST,"$withval",["The default tn3270 host"]) ], | ||
523 | - [ AC_MSG_NOTICE(No default host)]) | 522 | + [ app_default_host="$withval"], |
523 | + [ app_default_host=""]) | ||
524 | + | ||
525 | +AC_DEFINE_UNQUOTED(LIB3270_DEFAULT_HOST, $app_default_host, ["The default tn3270 host"]) | ||
526 | +AC_SUBST(LIB3270_DEFAULT_HOST,$app_default_host) | ||
524 | 527 | ||
525 | AC_ARG_ENABLE([static], | 528 | AC_ARG_ENABLE([static], |
526 | [AS_HELP_STRING([--enable-static], [Enable build and install the static library])], | 529 | [AS_HELP_STRING([--enable-static], [Enable build and install the static library])], |
sdk/lib3270-static.pc.in
@@ -8,6 +8,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ | @@ -8,6 +8,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ | ||
8 | sdk_version=@LIB3270_SDK_VERSION@ | 8 | sdk_version=@LIB3270_SDK_VERSION@ |
9 | library_name=@LIB3270_NAME@ | 9 | library_name=@LIB3270_NAME@ |
10 | product_name=@PRODUCT_NAME@ | 10 | product_name=@PRODUCT_NAME@ |
11 | +default_host=@LIB3270_DEFAULT_HOST@ | ||
11 | 12 | ||
12 | Name: @PACKAGE_NAME@-static | 13 | Name: @PACKAGE_NAME@-static |
13 | Description: @PACKAGE_DESCRIPTION@ (static library) | 14 | Description: @PACKAGE_DESCRIPTION@ (static library) |
sdk/lib3270.pc.in
@@ -8,6 +8,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ | @@ -8,6 +8,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ | ||
8 | sdk_version=@LIB3270_SDK_VERSION@ | 8 | sdk_version=@LIB3270_SDK_VERSION@ |
9 | library_name=@LIB3270_NAME@ | 9 | library_name=@LIB3270_NAME@ |
10 | product_name=@PRODUCT_NAME@ | 10 | product_name=@PRODUCT_NAME@ |
11 | +default_host=@LIB3270_DEFAULT_HOST@ | ||
11 | 12 | ||
12 | Name: @PACKAGE_NAME@ | 13 | Name: @PACKAGE_NAME@ |
13 | Description: @PACKAGE_DESCRIPTION@ | 14 | Description: @PACKAGE_DESCRIPTION@ |