Commit 06de2a540df97f3cc2af514c2c368e10685df663

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

Getting product name from lib3270 configuration.

Showing 1 changed file with 4 additions and 5 deletions   Show diff stats
@@ -143,11 +143,6 @@ dnl --------------------------------------------------------------------------- @@ -143,11 +143,6 @@ dnl ---------------------------------------------------------------------------
143 143
144 AC_SUBST(PACKAGE_DESCRIPTION,"3270 Virtual Terminal for GTK") 144 AC_SUBST(PACKAGE_DESCRIPTION,"3270 Virtual Terminal for GTK")
145 145
146 -AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product="pw3270" ])  
147 -  
148 -AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)  
149 -AC_SUBST(PRODUCT_NAME,$app_cv_product)  
150 -  
151 app_vrs_major=$(echo $VERSION | cut -d. -f1) 146 app_vrs_major=$(echo $VERSION | cut -d. -f1)
152 app_vrs_minor=$(echo $VERSION | cut -d. -f2) 147 app_vrs_minor=$(echo $VERSION | cut -d. -f2)
153 148
@@ -244,6 +239,10 @@ PKG_CHECK_MODULES( [LIB3270], [lib3270], AC_DEFINE(HAVE_LIB3270), AC_MSG_ERROR([ @@ -244,6 +239,10 @@ PKG_CHECK_MODULES( [LIB3270], [lib3270], AC_DEFINE(HAVE_LIB3270), AC_MSG_ERROR([
244 AC_SUBST(LIB3270_LIBS) 239 AC_SUBST(LIB3270_LIBS)
245 AC_SUBST(LIB3270_CFLAGS) 240 AC_SUBST(LIB3270_CFLAGS)
246 241
  242 +AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name lib3270` ])
  243 +AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
  244 +AC_SUBST(PRODUCT_NAME,$app_cv_product)
  245 +
247 dnl --------------------------------------------------------------------------- 246 dnl ---------------------------------------------------------------------------
248 dnl Check for GTK 247 dnl Check for GTK
249 dnl --------------------------------------------------------------------------- 248 dnl ---------------------------------------------------------------------------