diff --git a/source3/configure.in b/source3/configure.in
index 1107ad6..9e4eb58 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1653,9 +1653,7 @@ DSO_EXPORTS=""
 		*hpux*) AC_DEFINE(HPUX,1,[Whether the host os is HPUX])
 			# Use special PIC flags for the native HP-UX compiler.
 				BLDSHARED="true"
-				SHLD="cc"
-				LDSHFLAGS="-b -Wl,-B,symbolic,-b,-z"
-				SONAMEFLAG="-Wl,+h "
+				LDSHFLAGS="-b -Wl,-B,symbolic,-b,-z \${CFLAGS}"
 				PICFLAG="+z"
 			if test "${GCC}" = "yes"; then
 				PICFLAG="-fPIC"
@@ -1670,6 +1668,11 @@ DSO_EXPORTS=""
 				SHLIBEXT="sl"
 				DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
 			fi
+			if test "$ac_cv_prog_gnu_ld" = "yes"; then
+				SONAMEFLAG="-Wl,-soname="
+			else
+				SONAMEFLAG="-Wl,+h "
+			fi
 			AC_DEFINE(STAT_ST_BLOCKSIZE,8192,[The size of a block])
 			AC_DEFINE(POSIX_ACL_NEEDS_MASK,1,[Does a POSIX ACL need a mask element])
 			;;