* configure.in (CFLAGS): Don't set this according to the value of

	the GCC shell variable.  Instead, consult the machine and system
	files for the values of C_OPTIMIZE_SWITCH and C_DEBUG_SWITCH, and
	test __GNUC__ while we're at it.

	* configure.in: Check to see if the system has -ldnet.

1 files changed, 17 insertions, 5 deletions

diff --git a/configure1.in b/configure1.in
index 1d494e24dc6..30cfb321170 100755
--- a/configure1.in
+++ b/configure1.in
@@ -921,11 +921,6 @@ case ${with_gcc} in
     ] AC_PROG_CC [
 esac
 
-CFLAGS='-g'
-if test -n "${GCC}"; then
-  CFLAGS='-g -O'
-fi
-
 #### Some other nice autoconf tests.  If you add a test here which
 #### should make an entry in src/config.h, don't forget to add an
 #### #undef clause to src/config.h.in for autoconf to modify.
@@ -942,6 +937,9 @@ AC_HAVE_HEADERS(sys/timeb.h sys/time.h)
 AC_STDC_HEADERS
 AC_TIME_WITH_SYS_TIME
 
+dnl checks for library files
+AC_HAVE_LIBRARY(-ldnet)
+
 dnl checks for typedefs
 AC_RETSIGTYPE
 
@@ -1085,6 +1083,20 @@ echo '
 #else
 @configure@ system_malloc=no
 #endif
+
+#ifndef C_DEBUG_SWITCH
+#define C_DEBUG_SWITCH -g
+#endif
+
+#ifndef C_OPTIMIZE_SWITCH
+#define C_OPTIMIZE_SWITCH -O
+#endif
+
+#ifdef __GNUC__
+@configure@ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH
+#else
+@configure@ CFLAGS=C_DEBUG_SWITCH
+#endif
 ' > ${tempcname}
 # The value of CPP is a quoted variable reference, so we need to do this
 # to get its actual value...