Tweak build system to deal somewhat better with HPUX shared libs

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12095 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 903449e247e8dfce1f82bf9f43f9fd0bd567455f..9f28934dc47d367e9d18357f8d7b8913bbde0c84 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-01  Tom Yu  <tlyu@mit.edu>
+
+       * aclocal.m4: Add support for setting the INSTALL_SHLIB variable.
+       Tweak the HPUX shared lib build somewhat.
+
 2000-02-28  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Add enable-kdc-replay-cache arg, to make usage

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 2c30f36bc8e6e0496b4351f16d309a73a1d21890..dba83554a06012fc09a00d884518f78a0dd91b4f 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -906,6 +906,7 @@ AC_SUBST(LIBLINKS)
 AC_SUBST(LDCOMBINE)
 AC_SUBST(LDCOMBINE_TAIL)
 AC_SUBST(SHLIB_EXPFLAGS)
+AC_SUBST(INSTALL_SHLIB)
 AC_SUBST(STLIBEXT)
 AC_SUBST(SHLIBEXT)
 AC_SUBST(SHLIBVEXT)
@@ -941,6 +942,7 @@ AC_SUBST(LIBLINKS)
 AC_SUBST(LDCOMBINE)
 AC_SUBST(LDCOMBINE_TAIL)
 AC_SUBST(SHLIB_EXPFLAGS)
+AC_SUBST(INSTALL_SHLIB)
 AC_SUBST(STLIBEXT)
 AC_SUBST(SHLIBEXT)
 AC_SUBST(SHLIBVEXT)
@@ -1106,6 +1108,8 @@ SHLIBVEXT=.so.v-nobuild
 SHLIBSEXT=.so.s-nobuild
 # Most systems support profiled libraries.
 PFLIBEXT=_p.a
+# Most systems install shared libs as mode 644, etc. while hpux wants 755
+INSTALL_SHLIB='$(INSTALL_DATA)'
 
 STOBJEXT=.o
 SHOBJEXT=.so
@@ -1130,7 +1134,7 @@ alpha-dec-osf*)
        RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib; export LD_LIBRARY_PATH; _RLD_ROOT=/dev/dummy/d; export _RLD_ROOT;'
        ;;
 
-# HPUX untested...
+# HPUX *seems* to work under 10.20.
 # 
 # Note: "-Wl,+s" when building executables enables the use of the
 # SHLIB_PATH environment variable for finding shared libraries 
@@ -1142,10 +1146,12 @@ alpha-dec-osf*)
 #
 *-*-hpux*)
        PICFLAGS=+z
+       INSTALL_SHLIB='$(INSTALL_PROGRAM)'
        SHLIBEXT=.sl
        SHLIBVEXT='.sl.$(LIBMAJOR).$(LIBMINOR)'
+       SHLIBSEXT='.sl.$(LIBMAJOR)'
        SHLIB_EXPFLAGS='+b $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
-       LDCOMBINE='ld -b'
+       LDCOMBINE='ld -b +h lib$(LIB)$(SHLIBSEXT)'
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,+s -Wl,+b,$(PROG_RPATH)'
        CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
        RUN_ENV='SHLIB_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export SHLIB_PATH;'

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index f6f9ea866c8987a7b37788cf1503330646db59cf..97bce15ad1dfdf39cba49cfec5c8035f0a7edffe 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-01  Tom Yu  <tlyu@mit.edu>
+
+       * pre.in (INSTALL_SHLIB): New variable.
+
+       * lib.in (install-shared): Use $(INSTALL_SHLIB)
+
 2000-02-15  Tom Yu  <tlyu@mit.edu>
 
        * libobj.in: Fix up .c.so and .c.po rules to include $(CFLAGS),

diff --git a/src/config/lib.in b/src/config/lib.in
index 22a801b9ed7885100886f194eed290abd4d16cc1..203376ec1cb6c97c4e4d5045b6f96e040459135b 100644 (file)
--- a/src/config/lib.in
+++ b/src/config/lib.in
@@ -150,7 +150,7 @@ install-static:
 install-shared:
        $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT)
        $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBEXT)
-       $(INSTALL_DATA) lib$(LIB)$(SHLIBVEXT) $(DESTDIR)$(KRB5_LIBDIR)
+       $(INSTALL_SHLIB) lib$(LIB)$(SHLIBVEXT) $(DESTDIR)$(KRB5_LIBDIR)
        (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIB)$(SHLIBVEXT) \
                lib$(LIB)$(SHLIBEXT))
 install-shlib-soname: install-shared

diff --git a/src/config/pre.in b/src/config/pre.in
index 375df9fa8ee9d45001863110a3f3462630ff3647..abc3dff58c978e76aa99d65dd3a29ec9d9f7cdab 100644 (file)
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -90,6 +90,7 @@ CLNTDEPLIBS = @CLNTDEPLIBS@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@ -s
 INSTALL_DATA=@INSTALL_DATA@
+INSTALL_SHLIB=@INSTALL_SHLIB@
 INSTALL_SETUID=$(INSTALL) -s -m 4755 -o root
 ## This is needed because autoconf will sometimes define @exec_prefix@ to be
 ## ${prefix}.