Don't require winpthread in stable branch
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 18 Aug 2016 07:59:16 +0000 (09:59 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 18 Aug 2016 07:59:16 +0000 (09:59 +0200)
* configure.ac, src/inst-gpg4win.nsi, src/unist-gpg4win.nsi:
Remove winpthread.
--
Stable is supposed to be build on debian wheezy where winpthread
is not pulled in as a dependency by mingw.

configure.ac
src/inst-gpg4win.nsi
src/uninst-gpg4win.nsi

index b4027c5..78dc17e 100644 (file)
@@ -260,7 +260,6 @@ done
 # Additional runtime libraries from mingw.
 GPG4WIN_RUNTIME_LIBRARY(libgcc_s_sjlj-1)
 GPG4WIN_RUNTIME_LIBRARY(libstdc++-6)
-GPG4WIN_RUNTIME_LIBRARY(libwinpthread-1)
 
 AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
 AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
index 0e63295..cf9e93e 100644 (file)
@@ -91,7 +91,6 @@ Section "-gpg4win" SEC_gpg4win
   # list symbol names.
   File /oname=libstdc++-6.dll     "${BUILD_DIR}/libstdc++-6.dll-x"
   File /oname=libgcc_s_sjlj-1.dll "${BUILD_DIR}/libgcc_s_sjlj-1.dll-x"
-  File /oname=libwinpthread-1.dll "${BUILD_DIR}/libwinpthread-1.dll-x"
 
 !endif
 
index ba54fd4..2ab0f9e 100644 (file)
@@ -39,7 +39,6 @@ Section "-un.gpg4win"
   # Delete the runtime libaries
   Delete "$INSTDIR\libstdc++-6.dll"
   Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\libwinpthread-1.dll"
 
   # Delete standard stuff.
   Delete "$INSTDIR\share\gpg4win\README.*.txt"