Download as
Browse Code »

Commit c395d1f9ffd5f7b29dfff4395029e045658735a2

Authored by Perry Werneck
1 parent 8ffe1bd5
Exists in master and in 3 other branches develop, macos, network_module

Fixing MSYS2 builds.

Showing 2 changed files with 15 additions and 10 deletions   Show diff stats
@@ -75,7 +75,7 @@ dnl --------------------------------------------------------------------------- @@ -75,7 +75,7 @@ dnl ---------------------------------------------------------------------------
75 DLLPREFIX="lib" 75 DLLPREFIX="lib"
76 76
77 case "$host" in 77 case "$host" in
78 - *-mingw32) 78 + *-mingw32|*-pc-msys)
79 app_cv_osname="windows" 79 app_cv_osname="windows"
80 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" 80 CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
81 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" 81 LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
@@ -201,7 +201,7 @@ AC_CHECK_HEADER(libintl.h, [ @@ -201,7 +201,7 @@ AC_CHECK_HEADER(libintl.h, [
201 AC_DEFINE(HAVE_LIBINTL, 1) 201 AC_DEFINE(HAVE_LIBINTL, 1)
202 202
203 case "$host" in 203 case "$host" in
204 - *-mingw32) 204 + *-mingw32|*-pc-msys)
205 INTL_LIBS="-lintl" 205 INTL_LIBS="-lintl"
206 ;; 206 ;;
207 207
@@ -380,11 +380,11 @@ if test "$app_cv_enable_crl_check" == "yes"; then @@ -380,11 +380,11 @@ if test "$app_cv_enable_crl_check" == "yes"; then
380 AC_DEFINE(SSL_ENABLE_CRL_CHECK) 380 AC_DEFINE(SSL_ENABLE_CRL_CHECK)
381 fi 381 fi
382 382
383 -AC_ARG_WITH([default-crl-url],  
384 - [AS_HELP_STRING([--with-default-crl-url], [Set lib3270 default crl url])],  
385 -[  
386 - AC_DEFINE_UNQUOTED(SSL_DEFAULT_CRL_URL,"$withval")  
387 -],[ 383 +AC_ARG_WITH([default-crl-url],
  384 + [AS_HELP_STRING([--with-default-crl-url], [Set lib3270 default crl url])],
  385 +[
  386 + AC_DEFINE_UNQUOTED(SSL_DEFAULT_CRL_URL,"$withval")
  387 +],[
388 AC_MSG_NOTICE(No default crl url) 388 AC_MSG_NOTICE(No default crl url)
389 ]) 389 ])
390 390
@@ -447,7 +447,7 @@ AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_n @@ -447,7 +447,7 @@ AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_n
447 if test "$app_cv_inet_ntop" == "auto"; then 447 if test "$app_cv_inet_ntop" == "auto"; then
448 448
449 case "$host" in 449 case "$host" in
450 - *-mingw32) 450 + *-mingw32|*-pc-msys)
451 app_cv_inet_ntop="yes" 451 app_cv_inet_ntop="yes"
452 ;; 452 ;;
453 453
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 <Unit filename="LICENCA" /> 39 <Unit filename="LICENCA" />
40 <Unit filename="LICENSE" /> 40 <Unit filename="LICENSE" />
41 <Unit filename="README.md" /> 41 <Unit filename="README.md" />
  42 + <Unit filename="configure.ac" />
42 <Unit filename="gitsync.sh" /> 43 <Unit filename="gitsync.sh" />
43 <Unit filename="src/include/3270ds.h" /> 44 <Unit filename="src/include/3270ds.h" />
44 <Unit filename="src/include/actionsc.h" /> 45 <Unit filename="src/include/actionsc.h" />
@@ -111,7 +112,9 @@ @@ -111,7 +112,9 @@
111 <Unit filename="src/lib3270++/private.h" /> 112 <Unit filename="src/lib3270++/private.h" />
112 <Unit filename="src/lib3270++/session.cc" /> 113 <Unit filename="src/lib3270++/session.cc" />
113 <Unit filename="src/lib3270++/testprogram/testprogram.cc" /> 114 <Unit filename="src/lib3270++/testprogram/testprogram.cc" />
114 - <Unit filename="src/lib3270++/windows/resources.rc" /> 115 + <Unit filename="src/lib3270++/windows/resources.rc">
  116 + <Option compilerVar="WINDRES" />
  117 + </Unit>
115 <Unit filename="src/lib3270/actions.c"> 118 <Unit filename="src/lib3270/actions.c">
116 <Option compilerVar="CC" /> 119 <Option compilerVar="CC" />
117 </Unit> 120 </Unit>
@@ -254,7 +257,9 @@ @@ -254,7 +257,9 @@
254 <Unit filename="src/lib3270/windows/event_dispatcher.c"> 257 <Unit filename="src/lib3270/windows/event_dispatcher.c">
255 <Option compilerVar="CC" /> 258 <Option compilerVar="CC" />
256 </Unit> 259 </Unit>
257 - <Unit filename="src/lib3270/windows/resources.rc" /> 260 + <Unit filename="src/lib3270/windows/resources.rc">
  261 + <Option compilerVar="WINDRES" />
  262 + </Unit>
258 <Unit filename="src/lib3270/windows/resources.rc.in" /> 263 <Unit filename="src/lib3270/windows/resources.rc.in" />
259 <Unit filename="src/lib3270/windows/util.c"> 264 <Unit filename="src/lib3270/windows/util.c">
260 <Option compilerVar="CC" /> 265 <Option compilerVar="CC" />