Changeset 3528

Timestamp:

06/05/08 19:03:47 (4 months ago)

Author:

alonbl

Message:

Prepare for libtool-2

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• aclocal (modified) (1 prop)
• aclocal/Makefile.am (deleted)
• configure.ac (modified) (20 diffs)
• src/pkcs11/Makefile.am (modified) (3 diffs)
• svnignore (modified) (1 diff)

trunk/Makefile.am

@@ -9 +9 @@
         $(srcdir)/depcomp $(srcdir)/aclocal.m4 \
         $(srcdir)/config.guess $(srcdir)/config.sub \
+        $(srcdir)/aclocal/ltsugar.m4 $(srcdir)/aclocal/libtool.m4 \
+        $(srcdir)/aclocal/ltversion.m4 $(srcdir)/aclocal/lt~obsolete.m4 \
+        $(srcdir)/aclocal/ltoptions.m4 \
         $(srcdir)/packaged
 EXTRA_DIST = Makefile.mak svnignore
 
-SUBDIRS = aclocal etc src win32 doc
+SUBDIRS = etc src win32 doc
 
 dist_noinst_SCRIPTS = bootstrap

trunk/aclocal

@@ -16 +16 @@
 libtool
 libtool.m4
+lt*.m4
 ltmain.sh
 missing

@@ -16 +16 @@
 libtool
 libtool.m4
+lt*.m4
 ltmain.sh
 missing

trunk/configure.ac

@@ -1 +1 @@
 dnl -*- mode: m4; -*-
 
-AC_PREREQ([2.60])
+AC_PREREQ(2.61)
 
 define([PACKAGE_VERSION_MAJOR], [0])
@@ -7 +7 @@
 define([PACKAGE_VERSION_FIX], [4])
 
-AC_INIT([opensc], [PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX-svn])
+AC_INIT([opensc],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX-svn])
 AC_CONFIG_AUX_DIR([.])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([aclocal])
 AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
 
@@ -43 +44 @@
 AC_ARG_WITH(
         [cygwin-native],
-        [AC_HELP_STRING([--with-cygwin-native], [compile native win32])],
+        [AS_HELP_STRING([--with-cygwin-native],[compile native win32])],
         ,
         [with_cygwin_native="no"]
@@ -106 +107 @@
 AC_ARG_ENABLE(
         [strict],
-        [AC_HELP_STRING([--enable-strict], [enable strict compile mode @<:@disabled@:>@])],
+        [AS_HELP_STRING([--enable-strict],[enable strict compile mode @<:@disabled@:>@])],
         ,
         [enable_strict="no"]
@@ -113 +114 @@
 AC_ARG_ENABLE(
         [pedantic],
-        [AC_HELP_STRING([--enable-pedantic], [enable pedantic compile mode @<:@disabled@:>@])],
+        [AS_HELP_STRING([--enable-pedantic],[enable pedantic compile mode @<:@disabled@:>@])],
         ,
         [enable_pedantic="no"]
@@ -120 +121 @@
 AC_ARG_ENABLE(
         [zlib],
-        [AC_HELP_STRING([--enable-zlib], [enable zlib linkage @<:@detect@:>@])],
+        [AS_HELP_STRING([--enable-zlib],[enable zlib linkage @<:@detect@:>@])],
         ,
         [enable_zlib="detect"]
@@ -127 +128 @@
 AC_ARG_ENABLE(
         [readline],
-        [AC_HELP_STRING([--enable-readline], [enable readline linkage @<:@detect@:>@])],
+        [AS_HELP_STRING([--enable-readline],[enable readline linkage @<:@detect@:>@])],
         ,
         [enable_readline="detect"]
@@ -134 +135 @@
 AC_ARG_ENABLE(
         [openssl],
-        [AC_HELP_STRING([--enable-openssl], [enable openssl linkage @<:@detect@:>@])],
+        [AS_HELP_STRING([--enable-openssl],[enable openssl linkage @<:@detect@:>@])],
         ,
         [enable_openssl="detect"]
@@ -141 +142 @@
 AC_ARG_ENABLE(
         [openct],
-        [AC_HELP_STRING([--enable-openct], [enable openct linkage @<:@disabled@:>@])],
+        [AS_HELP_STRING([--enable-openct],[enable openct linkage @<:@disabled@:>@])],
         ,
         [enable_openct="no"]
@@ -148 +149 @@
 AC_ARG_ENABLE(
         [pcsc],
-        [AC_HELP_STRING([--enable-pcsc], [enable pcsc support @<:@disabled@:>@])],
+        [AS_HELP_STRING([--enable-pcsc],[enable pcsc support @<:@disabled@:>@])],
         ,
         [enable_pcsc="no"]
@@ -155 +156 @@
 AC_ARG_ENABLE(
         [nsplugin],
-        [AC_HELP_STRING([--enable-nsplugin], [enable nsplugin (signer) @<:@disabled@:>@])],
+        [AS_HELP_STRING([--enable-nsplugin],[enable nsplugin (signer) @<:@disabled@:>@])],
         ,
         [enable_nsplugin="no"]
@@ -162 +163 @@
 AC_ARG_ENABLE(
         [man],
-        [AC_HELP_STRING([--disable-man], [disable installation of manuals @<:@enabled for none Windows@:>@])],
+        [AS_HELP_STRING([--disable-man],[disable installation of manuals @<:@enabled for none Windows@:>@])],
         ,
         [
@@ -175 +176 @@
 AC_ARG_ENABLE(
         [doc],
-        [AC_HELP_STRING([--enable-doc], [enable installation of documents @<:@disabled@:>@])],
+        [AS_HELP_STRING([--enable-doc],[enable installation of documents @<:@disabled@:>@])],
         ,
         [enable_doc="no"]
@@ -182 +183 @@
 AC_ARG_WITH(
         [xsl-stylesheetsdir],
-        [AC_HELP_STRING([--with-xsl-stylesheetsdir=PATH], [docbook xsl-stylesheets for svn build @<:@detect@:>@])],
+        [AS_HELP_STRING([--with-xsl-stylesheetsdir=PATH],[docbook xsl-stylesheets for svn build @<:@detect@:>@])],
         [xslstylesheetsdir="${withval}"],
         [xslstylesheetsdir="detect"]
@@ -189 +190 @@
 AC_ARG_WITH(
         [plugindir],
-        [AC_HELP_STRING([--with-plugindir=PATH], [install Mozilla plugin to PATH @<:@LIBDIR/mozilla/plugins@:>@])],
+        [AS_HELP_STRING([--with-plugindir=PATH],[install Mozilla plugin to PATH @<:@LIBDIR/mozilla/plugins@:>@])],
         [plugindir="${withval}"],
         [plugindir="\$(libdir)/mozilla/plugins"]
@@ -196 +197 @@
 AC_ARG_WITH(
         [pcsc-provider],
-        [AC_HELP_STRING([--with-pcsc-provider=PATH], [Path to system pcsc provider @<:@system default@:>@])],
+        [AS_HELP_STRING([--with-pcsc-provider=PATH],[Path to system pcsc provider @<:@system default@:>@])],
         ,
         [with_pcsc_provider="detect"]
@@ -203 +204 @@
 AC_ARG_WITH(
         [pinentry],
-        [AC_HELP_STRING([--with-pinentry=PROG], [run PROG as PIN-entry for OpenSC Signer @<:/usr/bin/gpinentry:>@])],
+        [AS_HELP_STRING([--with-pinentry=PROG],[run PROG as PIN-entry for OpenSC Signer @<:/usr/bin/gpinentry:>@])],
         ,
         [with_pinentry="/usr/bin/gpinentry"]
@@ -220 +221 @@
 AC_LIBTOOL_RC
 AC_PROG_LIBTOOL
+#LT_INIT([win32-dll])
+#LT_LANG([Windows Resource])
 
 dnl These required for svn checkout
@@ -594 +597 @@
 fi
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
         Makefile
-        aclocal/Makefile
         doc/Makefile
         doc/nonpersistent/Makefile
@@ -622 +624 @@
         win32/versioninfo.rc.in
 ])
+AC_OUTPUT
 
 cat <<EOF

trunk/src/pkcs11/Makefile.am

@@ -29 +29 @@
 opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
         -export-symbols "$(srcdir)/opensc-pkcs11.exports" \
-        -module -avoid-version -no-undefined
+        -module -shared -avoid-version -no-undefined
 
 onepin_opensc_pkcs11_la_SOURCES = $(OPENSC_PKCS11_SRC) $(OPENSC_PKCS11_INC) hack-enabled.c
@@ -35 +35 @@
 onepin_opensc_pkcs11_la_LDFLAGS = $(AM_LDFLAGS) \
         -export-symbols "$(srcdir)/opensc-pkcs11.exports" \
-        -module -avoid-version -no-undefined
-
+        -module -shared -avoid-version -no-undefined
 
 pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports
@@ -42 +41 @@
 pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
         -export-symbols "$(srcdir)/pkcs11-spy.exports" \
-        -module -avoid-version -no-undefined
+        -module -shared -avoid-version -no-undefined
 
 if WIN32

trunk/svnignore

@@ -16 +16 @@
 libtool
 libtool.m4
+lt*.m4
 ltmain.sh
 missing

@@ -16 +16 @@
 libtool
 libtool.m4
+lt*.m4
 ltmain.sh
 missing