Changeset 155

Timestamp:

06/11/08 10:12:24 (4 years ago)

Author:

alonbl

Message:

Detect libtool-1 or libtool-2 at runtime

Location:

trunk

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• m4 (added)

trunk/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = foreign 1.10
-#ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
 
 MAINTAINERCLEANFILES = \
@@ -23 +23 @@
 # Allow detection of packaged tarball
 dist-hook:
+        $(MKDIR_P) "$(distdir)/m4"
         echo > "$(distdir)/packaged"

trunk/configure.ac

@@ -118 +118 @@
 
 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.