[pkg-opensc-commit] [libp11] 19/51: Merge branch 'nased0-MSYS2' of git://github.com/nased0/libp11 into nased0-nased0-MSYS2

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit 111b79a55d838f1e288cf1e08beecad34d2ae5f9
Merge: f9feb93 a628b3a
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Tue Oct 25 22:30:02 2016 +0200

    Merge branch 'nased0-MSYS2' of git://github.com/nased0/libp11 into nased0-nased0-MSYS2

 INSTALL.md          | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 configure.ac        | 13 +++++++++++
 examples/auth.c     |  9 +++++---
 examples/decrypt.c  | 11 +++++++---
 examples/listkeys.c |  2 --
 src/Makefile.am     |  4 +++-
 src/atfork.c        |  4 ++++
 7 files changed, 93 insertions(+), 12 deletions(-)

diff --cc configure.ac
index aef2f18,aa42819..6f65858
--- a/configure.ac
+++ b/configure.ac
@@@ -223,19 -221,18 +223,32 @@@ if test "${enable_strict}" = "yes"; the
  	CFLAGS="${CFLAGS} -Wall -Wextra"
  fi
  
 +rm -f src/libp11.map
 +echo "LIBP11_${LIBP11_LT_OLDEST}" > src/libp11.map
 +echo "{" >> src/libp11.map
 +echo "global:" >> src/libp11.map
 +#sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/;\n/g' <src/libp11.exports >>src/libp11.map
 +tr '\n' ';''\n' <src/libp11.exports >>src/libp11.map
 +echo "" >> src/libp11.map
 +echo "local:" >> src/libp11.map
 +echo '*;' >> src/libp11.map
 +echo "};" >> src/libp11.map
 +
 +chmod ugo-w src/libp11.map
 +
+ AC_MSG_CHECKING([if libtool needs -no-undefined flag to build shared libraries])
+ case "`uname`" in
+   CYGWIN*|MSYS*|MINGW*|AIX*)
+     ## Add in the -no-undefined flag to LDFLAGS for libtool.
+     AC_MSG_RESULT([yes])
+     LDFLAGS="$LDFLAGS -no-undefined"
+     ;;
+   *)
+     ## Don't add in anything.
+     AC_MSG_RESULT([no])
+     ;;
+ esac
++
  AC_CONFIG_FILES([
  	Makefile
  	src/Makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git