Clean up HP-UX and OSF/1 GCC-with-the-native-linker handling.
diff --git a/aclocal.m4 b/aclocal.m4
index bb27397..908604f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -101,7 +101,7 @@
#
case "$host_os" in
- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|hpux*|osf*)
+ freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
#
# Platforms where the linker is the GNU linker
# or accepts command-line arguments like
@@ -114,6 +114,17 @@
V_RPATH_OPT="-Wl,-rpath,"
;;
+ hpux*)
+ V_CCOPT="$V_CCOPT -fpic"
+ V_SHLIB_CMD="\$(CC)"
+ V_SHLIB_OPT="-shared"
+ #
+ # XXX - this assumes GCC is using the HP linker,
+ # rather than the GNU linker.
+ #
+ V_SONAME_OPT="-Wl,-soname,"
+ ;;
+
solaris*)
V_CCOPT="$V_CCOPT -fpic"
V_SHLIB_CMD="\$(CC)"
diff --git a/configure b/configure
index b831ba2..1b1fcc3 100755
--- a/configure
+++ b/configure
@@ -2925,7 +2925,12 @@
#
case "$host_os" in
- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|hpux*)
+ freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
+ #
+ # Platforms where the linker is the GNU linker
+ # or accepts command-line arguments like
+ # those the GNU linker accepts.
+ #
V_CCOPT="$V_CCOPT -fpic"
V_SHLIB_CMD="\$(CC)"
V_SHLIB_OPT="-shared"
@@ -2933,6 +2938,17 @@
V_RPATH_OPT="-Wl,-rpath,"
;;
+ hpux*)
+ V_CCOPT="$V_CCOPT -fpic"
+ V_SHLIB_CMD="\$(CC)"
+ V_SHLIB_OPT="-shared"
+ #
+ # XXX - this assumes GCC is using the HP linker,
+ # rather than the GNU linker.
+ #
+ V_SONAME_OPT="-Wl,-soname,"
+ ;;
+
solaris*)
V_CCOPT="$V_CCOPT -fpic"
V_SHLIB_CMD="\$(CC)"
@@ -3168,6 +3184,9 @@
;;
freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
+ #
+ # "cc" is GCC.
+ #
V_CCOPT="$V_CCOPT -fpic"
V_SHLIB_CMD="\$(CC)"
V_SHLIB_OPT="-shared"
@@ -3175,6 +3194,19 @@
V_RPATH_OPT="-Wl,-rpath,"
;;
+ osf*)
+ #
+ # Presumed to be DEC OSF/1, Digital UNIX, or
+ # Tru64 UNIX.
+ #
+ V_CCOPT="$V_CCOPT"
+ V_SHLIB_CMD="\$(CC)"
+ V_SHLIB_OPT="-shared"
+ V_SONAME_OPT="-soname "
+ V_RPATH_OPT="-rpath "
+ ;;
+
+
solaris*)
V_CCOPT="$V_CCOPT -Kpic"
V_SHLIB_CMD="\$(CC)"
