diff --git a/configure.ac b/configure.ac index 55f080b..9b2c363 100644 --- a/configure.ac +++ b/configure.ac @@ -95,10 +95,10 @@ case "$host" in RLS_CFLAGS="-DNDEBUG=1" CFLAGS="$CFLAGS -D_WIN32_WINNT=0x0600" - LIBS="$LIBS -lws2_32 -lwtsapi32 -lintl -lcomdlg32" + LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" dnl https://stackoverflow.com/questions/13768515/how-to-do-static-linking-of-libwinpthread-1-dll-in-mingw - STATIC_LDFLAGS="-static-libstdc++ -static-libgcc" + STATIC_LDFLAGS="-static-libstdc++ -static-libgcc -static" AC_CONFIG_FILES(win/makeruntime.sh) AC_CONFIG_FILES(win/copydeps.sh) @@ -218,6 +218,8 @@ dnl --------------------------------------------------------------------------- dnl Check for libintl dnl --------------------------------------------------------------------------- +INTL_LIBS="" + AC_PATH_TOOL([XGETTEXT], [xgettext], [no]) AC_PATH_TOOL([MSGCAT], [msgcat], [no]) AC_PATH_TOOL([MSGINIT], [msginit], [no]) @@ -229,8 +231,21 @@ AC_PATH_TOOL([OPTIPNG],[optipng],[no]) AC_CHECK_HEADER(libintl.h, [ AC_DEFINE(HAVE_LIBINTL, 1) + + case "$host" in + *-mingw32) + INTL_LIBS="-lintl" + ;; + + *) + INTL_LIBS="" + + esac + ]) +AC_SUBST(INTL_LIBS) + dnl --------------------------------------------------------------------------- dnl Check for ELF symbol visibility support dnl --------------------------------------------------------------------------- diff --git a/locale/pw3270.pot b/locale/pw3270.pot index be211ce..fb15313 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 17:39-0300\n" +"POT-Creation-Date: 2017-08-01 09:39-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-07-31 17:39-0300\n" +"POT-Creation-Date: 2017-08-01 09:39-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 934d3e3..f003c37 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -76,7 +76,7 @@ HOST_CC=@HOST_CC@ LD=@CC@ CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @LIBSSL_CFLAGS@ -LIBS=@LIBS@ @LIBSSL_LIBS@ @LIBICONV@ +LIBS=@LIBS@ @LIBSSL_LIBS@ @LIBICONV@ @INTL_LIBS@ LDFLAGS=@LDFLAGS@ #---[ Rules ]---------------------------------------------------------------------------- diff --git a/win/makeruntime.sh.in b/win/makeruntime.sh.in index fd02d31..a1c3afe 100755 --- a/win/makeruntime.sh.in +++ b/win/makeruntime.sh.in @@ -145,9 +145,6 @@ copy_dll() { done < ${REQUIRES} - # Anexo as obrigatórias - cp ${prefix}/bin/libwinpthread-1.dll ${TARGET} - rm -f ${SOURCES} rm -f ${REQUIRES} diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in index 85e53d9..ed87690 100644 --- a/win/pw3270.nsi.in +++ b/win/pw3270.nsi.in @@ -134,7 +134,6 @@ SubSection "@PACKAGE@" SecMain CreateDirectory "$INSTDIR\plugins" file "/oname=$INSTDIR\plugins\hllapi.dll" "..\.bin\Release\plugins\hllapi.dll" file "/oname=$SYSDIR\libhllapi.dll" "..\.bin\Release\libhllapi.dll.@PACKAGE_VERSION@" - file "/oname=$SYSDIR\libwinpthread-1.dll" "..\.bin\runtime\libwinpthread-1.dll" sectionEnd -- libgit2 0.21.2