Fix for PR gdb/209, PR gdb/156:

[deliverable/binutils-gdb.git] / gdb / configure.in

diff --git a/gdb/configure.in b/gdb/configure.in
index f676877eaa1ab9f6483abf38ba33d7df9ca48f10..b3ac702abd161f1efa9f56012b98d491ceb4deb6 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -131,9 +131,10 @@ AC_HEADER_STAT
 
 AC_C_CONST
 
-AC_CHECK_FUNCS(setpgid setpgrp sbrk sigaction isascii bzero bcopy btowc poll sigprocmask)
-AC_FUNC_VFORK
+AC_CHECK_FUNCS(bcopy btowc bzero isascii poll sbrk setpgid setpgrp \
+       sigaction sigprocmask sigsetmask)
 AC_FUNC_ALLOCA
+AC_FUNC_VFORK
 dnl AC_FUNC_SETPGRP does not work when cross compiling
 dnl Instead, assume we will have a prototype for setpgrp if cross compiling.
 if test "$cross_compiling" = no; then
@@ -745,11 +746,10 @@ then
        case $w in
        -Werr*) WERROR_CFLAGS=-Werror ;;
        *) # Check that GCC accepts it
-           if $CC $w 2>&1 | grep 'unrecognized option' > /dev/null; then
-               :
-           else
-               WARN_CFLAGS="${WARN_CFLAGS} $w"
-           fi
+           saved_CFLAGS="$CFLAGS"
+           CFLAGS="$CFLAGS $w"
+           AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",)
+           CFLAGS="$saved_CFLAGS"
        esac
     done
     AC_MSG_RESULT(${WARN_CFLAGS}${WERROR_CFLAGS})
@@ -941,6 +941,13 @@ configdir="unix"
 GDBTKLIBS=
 if test "${enable_gdbtk}" = "yes"; then
 
+    # Gdbtk must have an absolute path to srcdir in order to run
+    # properly when not installed.
+    here=`pwd`
+    cd ${srcdir}
+    GDBTK_SRC_DIR=`pwd`
+    cd $here
+
     CY_AC_PATH_TCLCONFIG
     if test -z "${no_tcl}"; then
        CY_AC_LOAD_TCLCONFIG
@@ -987,19 +994,10 @@ if test "${enable_gdbtk}" = "yes"; then
 
           CY_AC_PATH_ITCLCONFIG
            if test -z "${no_itcl}"; then
-             CY_AC_LOAD_ITCLCONFIG
-            case "${host}" in
-            *-*-cygwin*)
-               itcldir=../itcl/itcl/win/
-               ;;
-            *)
-               itcldir=../itcl/itcl/unix/
-               ;;
-            esac
- 
+             CY_AC_LOAD_ITCLCONFIG 
 
             ITCLLIB="${ITCL_BUILD_LIB_SPEC}"
-            ITCL_DEPS="${itcldir}${ITCL_LIB_FILE}"
+            ITCL_DEPS="${ITCL_LIB_FULL_PATH}"
            fi
 
           
@@ -1008,17 +1006,8 @@ if test "${enable_gdbtk}" = "yes"; then
            if test -z "${no_itcl}"; then
              CY_AC_LOAD_ITKCONFIG
 
-            case "${host}" in
-              *-*-cygwin*)
-                itkdir=../itcl/itk/win/
-                ;;
-              *)
-                itkdir=../itcl/itk/unix/
-                ;;
-              esac 
-
             ITKLIB="${ITK_BUILD_LIB_SPEC}"
-            ITK_DEPS="${itkdir}${ITK_LIB_FILE}"
+            ITK_DEPS="${ITK_LIB_FULL_PATH}"
            fi
 
           # now look for Tix library stuff
@@ -1080,6 +1069,7 @@ AC_SUBST(TIXLIB)
 AC_SUBST(TIX_DEPS)
 AC_SUBST(GDBTKLIBS)
 AC_SUBST(GDBTK_CFLAGS)
+AC_SUBST(GDBTK_SRC_DIR)
 
 AC_PATH_X
 
@@ -1329,8 +1319,10 @@ dnl Autoconf doesn't provide a mechanism for modifying definitions
 dnl provided by makefile fragments.
 dnl
 if test "${nativefile}" = ""; then
-sed -e '/^NATDEPFILES[[        ]]*=[[  ]]*/s//# NATDEPFILES=/' \
-       < Makefile > Makefile.tem
+        < Makefile \
+        sed -e '/^NATDEPFILES[[        ]]*=[[  ]]*/s//# NATDEPFILES=/' \
+        | sed -e '/^\(NATDEPFILES[[    ]]*[[+]]=[[     ]]*\)/s//# \1/' \
+       > Makefile.tem
 mv -f Makefile.tem Makefile
 fi