* configure.in configure (HPUX/OSF thread support): Enable this

	only when running GCC, since HP's thread header files use ANSI C
	which is not supported by their default compiler.

3 files changed, 32 insertions, 20 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 38dbc77..c625e08 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 Thu Feb 27 09:38:16 1997  Stu Grossman  (grossman@critters.cygnus.com)
 
+	* configure.in configure (HPUX/OSF thread support):  Enable this
+	only when running GCC, since HP's thread header files use ANSI C
+	which is not supported by their default compiler.
+
 	* configure.host (i[3456]86-*-windows):  Disable long long
 	support for WinGDB.  Add mswin to configdirs.
 	* configure.in configure:  Move calls to configure.host and
diff --git a/gdb/configure b/gdb/configure
index 3f1e040..02c60df 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -2287,19 +2287,23 @@ if test ${build} = ${host} -a ${host} = ${target} ; then
 		echo $ac_n "checking for HPUX/OSF thread support""... $ac_c" 1>&6
 echo "configure:2289: checking for HPUX/OSF thread support" >&5
 		if test -f /usr/include/dce/cma_config.h ; then
-			echo "$ac_t""yes" 1>&6
-			cat >> confdefs.h <<\EOF
+			if test "$GCC" = "yes" ; then
+				echo "$ac_t""yes" 1>&6
+				cat >> confdefs.h <<\EOF
 #define HAVE_HPUX_THREAD_SUPPORT 1
 EOF
 
-			CONFIG_OBS="${CONFIG_OJS} hpux-thread.o"
+				CONFIG_OBS="${CONFIG_OJS} hpux-thread.o"
+			else
+				echo "$ac_t""no (suppressed because you are not using GCC)" 1>&6
+			fi
 		else
 			echo "$ac_t""no" 1>&6
 		fi
 		;;
 	solaris*)
 		echo $ac_n "checking for Solaris thread debugging library""... $ac_c" 1>&6
-echo "configure:2303: checking for Solaris thread debugging library" >&5
+echo "configure:2307: checking for Solaris thread debugging library" >&5
 		if test -f /usr/lib/libthread_db.so.1 ; then
 			echo "$ac_t""yes" 1>&6
 			cat >> confdefs.h <<\EOF
@@ -2308,7 +2312,7 @@ EOF
 
 			CONFIG_OBS="${CONFIG_OBS} sol-thread.o"
 			echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2312: checking for dlopen in -ldl" >&5
+echo "configure:2316: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2316,7 +2320,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2320 "configure"
+#line 2324 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2327,7 +2331,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2468,7 +2472,7 @@ if test "${with_tclconfig+set}" = set; then
 fi
 
   echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
-echo "configure:2472: checking for Tcl configuration" >&5
+echo "configure:2476: checking for Tcl configuration" >&5
   if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2576,7 +2580,7 @@ if test "${with_tkconfig+set}" = set; then
 fi
 
   echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
-echo "configure:2580: checking for Tk configuration" >&5
+echo "configure:2584: checking for Tk configuration" >&5
   if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2670,7 +2674,7 @@ fi
 #
 no_tcl=true
 echo $ac_n "checking for Tcl private headers""... $ac_c" 1>&6
-echo "configure:2674: checking for Tcl private headers" >&5
+echo "configure:2678: checking for Tcl private headers" >&5
 # Check whether --with-tclinclude or --without-tclinclude was given.
 if test "${with_tclinclude+set}" = set; then
   withval="$with_tclinclude"
@@ -2736,17 +2740,17 @@ fi
 if test x"${ac_cv_c_tclh}" = x ; then
    ac_safe=`echo "tclInt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tclInt.h""... $ac_c" 1>&6
-echo "configure:2740: checking for tclInt.h" >&5
+echo "configure:2744: checking for tclInt.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2745 "configure"
+#line 2749 "configure"
 #include "confdefs.h"
 #include <tclInt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2806,7 +2810,7 @@ fi
 #
 no_tk=true
 echo $ac_n "checking for Tk private headers""... $ac_c" 1>&6
-echo "configure:2810: checking for Tk private headers" >&5
+echo "configure:2814: checking for Tk private headers" >&5
 # Check whether --with-tkinclude or --without-tkinclude was given.
 if test "${with_tkinclude+set}" = set; then
   withval="$with_tkinclude"
@@ -2872,17 +2876,17 @@ fi
 if test x"${ac_cv_c_tkh}" = x ; then
    ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tk.h""... $ac_c" 1>&6
-echo "configure:2876: checking for tk.h" >&5
+echo "configure:2880: checking for tk.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2881 "configure"
+#line 2885 "configure"
 #include "confdefs.h"
 #include <tk.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
diff --git a/gdb/configure.in b/gdb/configure.in
index c2d6e90..6e28fc3 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -177,9 +177,13 @@ if test ${build} = ${host} -a ${host} = ${target} ; then
 	hpux*)
 		AC_MSG_CHECKING(for HPUX/OSF thread support)
 		if test -f /usr/include/dce/cma_config.h ; then
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT)
-			CONFIG_OBS="${CONFIG_OJS} hpux-thread.o"
+			if test "$GCC" = "yes" ; then
+				AC_MSG_RESULT(yes)
+				AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT)
+				CONFIG_OBS="${CONFIG_OJS} hpux-thread.o"
+			else
+				AC_MSG_RESULT(no (suppressed because you are not using GCC))
+			fi
 		else
 			AC_MSG_RESULT(no)
 		fi