merge from 6.0.1 branch

diff --git a/Make-config b/Make-config
index 3e4b98597aba4a0b1bb60686a7d93f99f5ce8f74..2b2362fa00743df1b815119ed21f8dbd0a6ad645 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -340,6 +340,7 @@ hpux10:
        "CXX = aCC" \
        "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \
        "CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE" \
+       "MKLIB_OPTIONS = -static" \
        "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup"
 
 hpux10-sl:

diff --git a/bin/mklib b/bin/mklib
index ef6dd129b594462fe4a30865ab58cf8a2e4b9693..e7931e44dc445745d8941f253a1736f2472498bf 100755 (executable)
--- a/bin/mklib
+++ b/bin/mklib
@@ -290,14 +290,14 @@ case $ARCH in
     'HP-UX')
         if [ $STATIC = 1 ] ; then
            LIBNAME="lib${LIBNAME}.a"
-           echo "mklib: Making HPUX static library: " ${LIBNAME}
+           echo "mklib: Making HP-UX static library: " ${LIBNAME}
            rm -f ${LIBNAME}
            ar -ruv ${LIBNAME} ${OBJECTS}
            FINAL_LIBS=${LIBNAME}
        else
            RUNLIB="lib${LIBNAME}.${MAJOR}"
            DEVLIB="lib${LIBNAME}.sl"
-           echo "mklib: Making HPUX stared library: " ${RUNLIB} ${DEVLIB}
+           echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
            ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
            ln -s ${RUNLIB} ${DEVLIB}
            FINAL_LIBS="{RUNLIB} ${DEVLIB}"