diff options
| author | Dean Roehrich <roehrich@sgi.com> | 2001-07-24 20:22:44 +0000 |
|---|---|---|
| committer | Dean Roehrich <roehrich@sgi.com> | 2001-07-24 20:22:44 +0000 |
| commit | 311b140faae955c6e827275d65991370e4029c4d (patch) | |
| tree | b863bcc3a1ad68bd398c030c8314f027fb92d8ff | |
| parent | 2e69498478f27dd7b6fd10838adaa8cddc5f97ab (diff) | |
| download | dmapi-dev-311b140faae955c6e827275d65991370e4029c4d.tar.gz | |
fix the AC_ARG_ENABLE macro for --enable-shared.
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/builddefs.in | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 2dca568..39f531e 100644 --- a/configure.in +++ b/configure.in @@ -117,7 +117,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 bbed283..612e022 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -126,7 +126,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 @@ -138,7 +138,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 @@ -148,6 +149,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; \ |