Commit f63cba91e2987fedd46c13e973009a5cc3c19cd1
1 parent
33ce0e58
Exists in
master
and in
4 other branches
Fixing windows build.
Showing
2 changed files
with
4 additions
and
1 deletions
Show diff stats
configure.ac
@@ -188,6 +188,10 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product | @@ -188,6 +188,10 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product | ||
188 | AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) | 188 | AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product) |
189 | AC_SUBST(PRODUCT_NAME,$app_cv_product) | 189 | AC_SUBST(PRODUCT_NAME,$app_cv_product) |
190 | 190 | ||
191 | +AC_ARG_WITH([library-name], [AS_HELP_STRING([--with-library-name], [Set protocol library name])], [ app_cv_library="$withval" ],[ app_cv_library=`pkg-config --variable=library_name lib3270` ]) | ||
192 | +AC_DEFINE_UNQUOTED(LIBRARY_NAME, $app_cv_library) | ||
193 | +AC_SUBST(LIBRARY_NAME,$app_cv_library) | ||
194 | + | ||
191 | dnl --------------------------------------------------------------------------- | 195 | dnl --------------------------------------------------------------------------- |
192 | dnl Check for GTK | 196 | dnl Check for GTK |
193 | dnl --------------------------------------------------------------------------- | 197 | dnl --------------------------------------------------------------------------- |
win/pw3270.nsi.in
@@ -105,7 +105,6 @@ SubSection "@PRODUCT_NAME@" SecMain | @@ -105,7 +105,6 @@ SubSection "@PRODUCT_NAME@" SecMain | ||
105 | file "/oname=$INSTDIR\@PRODUCT_NAME@.ico" "@PACKAGE@.ico" | 105 | file "/oname=$INSTDIR\@PRODUCT_NAME@.ico" "@PACKAGE@.ico" |
106 | file "/oname=$INSTDIR\lib@LIBRARY_NAME@.dll" "lib@LIBRARY_NAME@.dll" | 106 | file "/oname=$INSTDIR\lib@LIBRARY_NAME@.dll" "lib@LIBRARY_NAME@.dll" |
107 | file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" | 107 | file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" |
108 | - file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" | ||
109 | 108 | ||
110 | # Configuration files | 109 | # Configuration files |
111 | file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png" | 110 | file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png" "@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png" |