[pkg-opensc-commit] [libp11] 126/239: Detect libtool-1 or libtool-2 at runtime

[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 12631b716957dcec5552e223a4be2800f9a905d6
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Wed Jun 11 10:12:24 2008 +0000

    Detect libtool-1 or libtool-2 at runtime
---
 Makefile.am  |  3 ++-
 configure.ac | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5cb8dfe..03f6b1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign 1.10
-#ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
 
 MAINTAINERCLEANFILES = \
 	config.log config.status \
@@ -22,4 +22,5 @@ SUBDIRS = src doc
 
 # Allow detection of packaged tarball
 dist-hook:
+	$(MKDIR_P) "$(distdir)/m4"
 	echo > "$(distdir)/packaged"
diff --git a/configure.ac b/configure.ac
index d3719cf..6689c81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,11 +117,18 @@ AC_PROG_SED
 AC_PROG_MAKE_SET
 
 dnl Add libtool support.
-AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_RC
-AC_PROG_LIBTOOL
-#LT_INIT([win32-dll])
-#LT_LANG([Windows Resource])
+ifdef(
+	[LT_INIT],
+	[
+		LT_INIT([win32-dll])
+		LT_LANG([Windows Resource])
+	],
+	[
+		AC_LIBTOOL_WIN32_DLL
+		AC_LIBTOOL_RC
+		AC_PROG_LIBTOOL
+	]
+)
 
 dnl Checks for header files.
 AC_HEADER_STDC

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