fix the AC_ARG_ENABLE macro for --enable-shared.

diff --git a/configure.in b/configure.in
index 534ec784152ae8a8ff033d848a3b5ce0761a1379..553ec532fff16f16c235d72334d284ad19a26d64 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -114,7 +114,7 @@ libtool=$LIBTOOL
 AC_SUBST(libtool)
 
 dnl libtool to build libraries static only?
-AC_ARG_ENABLE(enable_shared,
+AC_ARG_ENABLE(shared,
        [ --enable-shared=[yes/no]      Enable use of shared libraries [default=yes].],
        ,
        enable_shared=yes)

diff --git a/include/builddefs.in b/include/builddefs.in
index b20e9ec5753749c353e54257a41ae804b668aac2..acb0223284878cd449325e1b66642c7295578941 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -135,7 +135,7 @@ ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
        cd $(TOPDIR)/$(LIBNAME)/.libs; \
        ../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
-       ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_SLIB_DIR); \
+       ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_SLIB_DIR); \
        test "$(PKG_DISTRIBUTION)" = debian || \
        ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_SLIB_DIR)
 endif
@@ -147,7 +147,8 @@ INSTALL_LTLIB_DEV = \
        ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
        ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
        ../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
-       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_SLIB_DIR)
+       ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_SLIB_DIR); \
+       $(INSTALL_LTLIB_OLDLIB_SYMLINK)
 else
 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
 endif
@@ -157,6 +158,11 @@ INSTALL_LTLIB_STATIC = \
        ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
        ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)
 
+# Libtool thinks the static and shared libs should be in the same dir, so
+# make the static lib appear in the place we chose as rpath.
+INSTALL_LTLIB_OLDLIB_SYMLINK = \
+       ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_SLIB_DIR)/$(LIBNAME).a
+
 INSTALL_MAN = \
     @for d in $(MAN_PAGES); do \
        first=true; \