14 files changed, 23 insertions, 40 deletions
diff --git a/hints/aix.sh b/hints/aix.sh
index 569a292870..076eed5769 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -78,8 +78,7 @@ lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).
 esac
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-DUSE_THREADS -DNEED_PTHREAD_INIT $ccflags"
-    cppflags="-DUSE_THREADS -DNEED_PTHREAD_INIT $cppflags"
+    ccflags="-DNEED_PTHREAD_INIT $ccflags"
     case "$cc" in
     xlc_r | cc_r)
 	;;
diff --git a/hints/amigaos.sh b/hints/amigaos.sh
index e768643691..9d86e52bc0 100644
--- a/hints/amigaos.sh
+++ b/hints/amigaos.sh
@@ -42,10 +42,6 @@ lddlflags='-oformat a.out-amiga -r'
 # ccflags='-DAMIGAOS -mstackextend -m68020 -resident32'
 # ldflags='-m68020 -resident32'
 
-# Avoid telldir prototype conflict in pp_sys.c  (AmigaOS uses const DIR *)
-# Configure should test for this.  Volunteers?
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 # AmigaOS always reports only two links to directories, even if they
 # contain subdirectories.  Consequently, we use this variable to stop
 # File::Find using the link count to determine whether there are
diff --git a/hints/bsdos.sh b/hints/bsdos.sh
index 7c7c6e9565..c89a0a9833 100644
--- a/hints/bsdos.sh
+++ b/hints/bsdos.sh
@@ -33,9 +33,6 @@ libswanted="$*"
 glibpth="$glibpth /usr/X11/lib"
 ldflags="$ldflags -L/usr/X11/lib"
 
-# Avoid telldir prototype conflict in pp_sys.c
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 case "$optimize" in
 '')     optimize='-O2' ;;
 esac
diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 2e8ffac5bd..ae49f503a0 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -184,10 +184,10 @@ if [ "X$usethreads" != "X" ]; then
     # Threads interfaces changed with V4.0.
     case "$_DEC_uname_r" in
     *[123].*)	libswanted="$libswanted pthreads mach exc c_r"
-		ccflags="-DUSE_THREADS -threads $ccflags"
+		ccflags="-threads $ccflags"
 		;;
     *)		libswanted="$libswanted pthread exc"
-    		ccflags="-DUSE_THREADS -pthread $ccflags"
+    		ccflags="-pthread $ccflags"
 		;;
     esac
     usemymalloc='n'
diff --git a/hints/dos_djgpp.sh b/hints/dos_djgpp.sh
index 85455c3852..f50cd01884 100644
--- a/hints/dos_djgpp.sh
+++ b/hints/dos_djgpp.sh
@@ -2,6 +2,7 @@
 # Original by Laszlo Molnar <molnarl@cdata.tvnet.hu>
 
 # 971015 - archname changed from 'djgpp' to 'dos-djgpp'
+# 971210 - threads support
 
 archname='dos-djgpp'
 archobjs='djgpp.o'
@@ -38,7 +39,7 @@ startperl='#!perl'
 
 case "X$optimize" in
   X)
-	optimize="-O2 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+	optimize="-O2 -malign-loops=2 -malign-jumps=2 -malign-functions=2"
 	;;
 esac
 ldflags='-s'
@@ -61,3 +62,11 @@ case "\$1\$2" in
 esac
 exec tr.exe "\$@"
 EOSC
+
+if [ "X$usethreads" != "X" ]; then
+    ccflags="-DUSE_THREADS $ccflags"
+    cppflags="-DUSE_THREADS $cppflags"
+    set `echo X "$libswanted "| sed -e 's/ c / gthreads c /'`
+    shift
+    libswanted="$*"
+fi
diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index e20d40d249..5e89d56039 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -94,10 +94,6 @@ case "$osvers" in
 	;;
 esac
 
-# Avoid telldir prototype conflict in pp_sys.c  (FreeBSD uses const DIR *)
-# Configure should test for this.  Volunteers?
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 cat <<'EOM' >&4
 
 Some users have reported that Configure halts when testing for
@@ -120,5 +116,4 @@ EOM
         exit 1
     fi
     libswanted="$libswanted c_r"
-    ccflags="-DUSE_THREADS $ccflags"
 fi
diff --git a/hints/hpux.sh b/hints/hpux.sh
index c2500d0c37..cbf80cc669 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -60,10 +60,6 @@
 # reading from a NULL pointer causes a SEGV.
 ccflags="$ccflags -D_HPUX_SOURCE"
 
-# If you plan to use gcc, then you should uncomment the following line
-# so you get the HP math library and not the GCC math library.
-# ccflags="$ccflags -L/lib/pa1.1"
-
 # Check if you're using the bundled C compiler.  This compiler doesn't support
 # ANSI C (the -Aa flag) nor can it produce shared libraries.  Thus we have
 # to turn off dynamic loading.
@@ -92,6 +88,12 @@ EOM
     ;;
 esac
 
+# Even if you use gcc, prefer the HP math library over the GNU one.
+
+case "`$cc -v 2>&1`" in
+"*gcc*" ) test -d /lib/pa1.1 && ccflags="$ccflags -L/lib/pa1.1" ;;
+esac
+
 # Determine the architecture type of this system.
 # Keep leading tab below -- Configure Black Magic -- RAM, 03/02/97
 	xxOsRevMajor=`uname -r | sed -e 's/^[^0-9]*//' | cut -d. -f1`;
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 6d22d524b0..3d8202a8ae 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -84,9 +84,6 @@ case "$cc" in
 	;;
 esac
 
-# This should be a Configure thing, but not for now...
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 # We don't want these libraries.  Anyone know why?
 set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'`
 shift
@@ -160,8 +157,6 @@ EOF
 	esac
 	unset uname_r
     fi
-    ccflags="-DUSE_THREADS $ccflags"
-    cppflags="-DUSE_THREADS $cppflags"
     # -lpthread needs to come before -lc but after other libraries such
     # as -lgdbm and such like. We assume here that -lc is present in
     # libswanted. If that fails to be true in future, then this can be
diff --git a/hints/linux.sh b/hints/linux.sh
index 8ff7f5d747..1ddbca1964 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -195,8 +195,7 @@ fi
 # ccdlflags='-Wl,-E'
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-D_REENTRANT -DUSE_THREADS $ccflags"
-    cppflags="-D_REENTRANT -DUSE_THREADS $cppflags"
+    ccflags="-D_REENTRANT $ccflags"
     # -lpthread needs to come before -lc but after other libraries such
     # as -lgdbm and such like. We assume here that -lc is present in
     # libswanted. If that fails to be true in future, then this can be
diff --git a/hints/netbsd.sh b/hints/netbsd.sh
index c508815a46..836c7eff0b 100644
--- a/hints/netbsd.sh
+++ b/hints/netbsd.sh
@@ -56,7 +56,3 @@ case "$osvers" in
 	d_setruid="$undef"
 	;;
 esac
-
-# Avoid telldir prototype conflict in pp_sys.c  (NetBSD uses const DIR *)
-# Configure should test for this.  Volunteers?
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
diff --git a/hints/next_3.sh b/hints/next_3.sh
index 542a313a11..43340c03ad 100644
--- a/hints/next_3.sh
+++ b/hints/next_3.sh
@@ -99,8 +99,6 @@ ld='cc'
 i_utime='undef'
 groupstype='int'
 direntrytype='struct direct'
-netdb_host_type='char *'
-netdb_hlen_type='int'
 d_strcoll='undef'
 d_uname='define'
 #
diff --git a/hints/next_4.sh b/hints/next_4.sh
index d34400200b..b3887e612b 100644
--- a/hints/next_4.sh
+++ b/hints/next_4.sh
@@ -83,8 +83,6 @@ i_dbm='define'
 i_utime='undef'
 groupstype='int'
 direntrytype='struct direct'
-netdb_host_type='const char *'
-netdb_hlen_type='int'
 
 usemymalloc='y'
 clocktype='int'
diff --git a/hints/os2.sh b/hints/os2.sh
index a012a7317a..7cda0bf89b 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -246,8 +246,8 @@ case "X$optimize" in
 esac
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-DUSE_THREADS -Zmt $ccflags"
-    cppflags="-DUSE_THREADS -Zmt $cppflags"
+    ccflags="-Zmt $ccflags"
+    cppflags="-Zmt $cppflags"  # Do we really need to set this?
     aout_ccflags="-DUSE_THREADS $aout_ccflags"
     aout_cppflags="-DUSE_THREADS $aout_cppflags"
     aout_lddlflags="-Zmt $aout_lddlflags"
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 6b24dd1ef2..55d0416388 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -224,8 +224,7 @@ fi
 rm -f core
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-D_REENTRANT -DUSE_THREADS $ccflags"
-    cppflags="-D_REENTRANT -DUSE_THREADS $cppflags"
+    ccflags="-D_REENTRANT $ccflags"
     # -lpthread needs to come before -lc but after other libraries such
     # as -lgdbm and such like. We assume here that -lc is present in
     # libswanted. If that fails to be true in future, then this can be