[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-167-g77cc89f

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  77cc89fb9f41433c2cd9eab6e2cdf4aa4154f461 (commit)
      from  37f20300a6da9c45efd07bdc359e114709eea600 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 77cc89fb9f41433c2cd9eab6e2cdf4aa4154f461
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 8 10:46:53 2013 +0200

    Improve detection of libstdc++-6 et al.
    
    * configure.ac: Extract gcc version number and use as default
    directory of gcc helper DLLs.

diff --git a/.gitignore b/.gitignore
index 51475f9..fcf20df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,5 @@ src/mingwm10.dll
 /src/COMPONENTS-list.tmp
 
 /web/
+/src/libgcc_s_sjlj-1.dll
+/src/libstdc++-6.dll
diff --git a/configure.ac b/configure.ac
index d7b0439..db51bd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,58 +227,64 @@ AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
                [build-aux/gitlog-to-changelog])
 AC_PROG_INSTALL
 
+missing_tools=
+for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
+         DVIPDF CONVERT SHA1SUM MSGFMT ; do
+   eval tmp='$'$i
+   if test -z "$tmp"; then
+      missing_tools="$missing_tools `echo $i | tr 'A-Z' 'a-z'`"
+   fi
+done
+
 # GpgOL and GpgEx need the runtime libaries
 # The default path should probably be more generic
+changequote(,)dnl
+gcc_major_minor=$($CC --version \
+                  | awk 'NR==1 {split($NF,a,"."); print a[1] "." a[2]}')
+changequote([,])dnl
+
 libgcc_dll=no
-AC_ARG_WITH([libgcc_s_sjlj-dll],
+AC_ARG_WITH([libgcc_s_sjlj-1-dll],
            AC_HELP_STRING([--with-libgcc_s_sjlj-1-dll=FILE],
                           [use the libgcc_s_sjlj-1 DLL]),
            [libgcc_dll=$withval])
 if test "$libgcc_dll" = "no"; then
-  file="/usr/lib/gcc/$host/4.6/libgcc_s_sjlj-1.dll"
+  file="/usr/lib/gcc/$host/$gcc_major_minor/libgcc_s_sjlj-1.dll"
   if test -r "$file"; then
     libgcc_dll="$file"
   fi
 fi
 if test "$libgcc_dll" = "no"; then
   missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
-fi
-
-if test -r "$libgcc_dll"; then
-  cp $libstdcpp_dll src/libstdc++-6.dll
 else
-  missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
+  if test -r "$libgcc_dll"; then
+    cp $libgcc_dll src/libgcc_s_sjlj-1.dll
+  else
+    missing_tools="libgcc_s_sjlj-1.dll $missing_tools"
+  fi
 fi
 
 libstdcpp_dll=no
-AC_ARG_WITH([libstdcpp_s_sjlj-dll],
+AC_ARG_WITH([libstdc++-6-dll],
            AC_HELP_STRING([--with-libstdc++-6-dll=FILE],
-                          [use the libstdc++-6 DLL]),
+                          [use the libstd++-6 DLL]),
            [libstdcpp_dll=$withval])
 if test "$libstdcpp_dll" = "no"; then
-  file="/usr/lib/gcc/$host/4.6/libstdc++-6.dll"
+  file="/usr/lib/gcc/$host/$gcc_major_minor/libstdc++-6.dll"
   if test -r "$file"; then
     libstdcpp_dll="$file"
   fi
 fi
 if test "$libstdcpp_dll" = "no"; then
   missing_tools="libstdc++-6.dll $missing_tools"
-fi
-if test -r "$libstdcpp_dll"; then
-  cp $libgcc_dll src/libgcc_s_sjlj-1.dll
 else
-  missing_tools="libstdc++-6.dll $missing_tools"
+  if test -r "$libstdcpp_dll"; then
+    cp $libstdcpp_dll src/libstdc++-6.dll
+  else
+    missing_tools="libstdc++-6.dll $missing_tools"
+ fi
 fi
 
-missing_tools=
-for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
-         DVIPDF CONVERT SHA1SUM MSGFMT ; do
-   eval tmp='$'$i
-   if test -z "$tmp"; then
-      missing_tools="$missing_tools `echo $i | tr 'A-Z' 'a-z'`"
-   fi
-done
-
 AC_CHECK_PROGS(GLIB_GENMARSHAL, glib-genmarshal)
 AC_CHECK_PROGS(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
 AC_CHECK_PROGS(GLIB_COMPILE_RESOURCES, glib-compile-resources)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore   |    2 ++
 configure.ac |   52 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org