* lin-lwp.c (stop_wait_callback): Remove bogus assertions in the

[deliverable/binutils-gdb.git] / gdb / acinclude.m4

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index e81b4cdd8a36ac59554a9ee87a3ecb41eb1caf1d..a55e36fe8b0bce38b77ef72f99a4dc2abb16f81b 100644 (file)
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -493,7 +493,7 @@ AC_DEFUN(CY_AC_PATH_ITCLCONFIG, [
 if test x"${no_itcl}" = x ; then
   # we reset no_itcl in case something fails here
   no_itcl=true
-  AC_ARG_WITH(itclconfig, [  --with-itclconfig           directory containing itcl configuration (itclConfig.sh)],
+  AC_ARG_WITH(itclconfig, [  --with-itclconfig       Directory containing itcl configuration (itclConfig.sh)],
          with_itclconfig=${withval})
   AC_MSG_CHECKING([for Itcl configuration])
   AC_CACHE_VAL(ac_cv_c_itclconfig,[
@@ -516,8 +516,8 @@ if test x"${no_itcl}" = x ; then
                `ls -dr ../../itcl[[4-9]]*/itcl 2>/dev/null` \
                ../../../itcl \
                `ls -dr ../../../itcl[[4-9]]*/itcl 2>/dev/null` ; do
-      if test -f "$i/${configdir}/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i/${configdir}; pwd)`
+      if test -f "$i/itclConfig.sh" ; then
+        ac_cv_c_itclconfig=`(cd $i; pwd)`
        break
       fi
     done
@@ -536,8 +536,8 @@ if test x"${no_itcl}" = x ; then
     for i in \
                ${srcdir}/../itcl/itcl \
                `ls -dr ${srcdir}/../itcl[[4-9]]*/itcl 2>/dev/null` ; do
-      if test -f "$i/${configdir}/itclConfig.sh" ; then
-        ac_cv_c_itclconfig=`(cd $i/${configdir}; pwd)`
+      if test -f "$i/itclConfig.sh" ; then
+        ac_cv_c_itclconfig=`(cd $i; pwd)`
        break
       fi
     done
@@ -619,7 +619,7 @@ AC_DEFUN(CY_AC_PATH_ITKCONFIG, [
 if test x"${no_itk}" = x ; then
   # we reset no_itk in case something fails here
   no_itk=true
-  AC_ARG_WITH(itkconfig, [  --with-itkconfig           directory containing itk configuration (itkConfig.sh)],
+  AC_ARG_WITH(itkconfig, [  --with-itkconfig        Directory containing itk configuration (itkConfig.sh)],
          with_itkconfig=${withval})
   AC_MSG_CHECKING([for Itk configuration])
   AC_CACHE_VAL(ac_cv_c_itkconfig,[
@@ -642,8 +642,8 @@ if test x"${no_itk}" = x ; then
                `ls -dr ../../itcl[[4-9]]*/itk 2>/dev/null` \
                ../../../itk \
                `ls -dr ../../../itcl[[4-9]]*/itk 2>/dev/null` ; do
-      if test -f "$i/${configdir}/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i/${configdir}; pwd)`
+      if test -f "$i/itkConfig.sh" ; then
+        ac_cv_c_itkconfig=`(cd $i; pwd)`
        break
       fi
     done
@@ -662,8 +662,8 @@ if test x"${no_itk}" = x ; then
     for i in \
                ${srcdir}/../itcl/itk \
                `ls -dr ${srcdir}/../itcl[[4-9]]*/itk 2>/dev/null` ; do
-      if test -f "$i/${configdir}/itkConfig.sh" ; then
-        ac_cv_c_itkconfig=`(cd $i/${configdir}; pwd)`
+      if test -f "$i/itkConfig.sh" ; then
+        ac_cv_c_itkconfig=`(cd $i; pwd)`
        break
       fi
     done
@@ -765,7 +765,7 @@ AC_DEFUN(CY_AC_PATH_TIXCONFIG, [
 if test x"${no_tix}" = x ; then
   # we reset no_tix in case something fails here
   no_tix=true
-  AC_ARG_WITH(tixconfig, [  --with-tixconfig           directory containing tix configuration (tixConfig.sh)],
+  AC_ARG_WITH(tixconfig, [  --with-tixconfig        Directory containing tix configuration (tixConfig.sh)],
          with_tixconfig=${withval})
   AC_MSG_CHECKING([for Tix configuration])
   AC_CACHE_VAL(ac_cv_c_tixconfig,[
@@ -859,3 +859,10 @@ dnl    AC_SUBST(TIX_BUILD_INCLUDES)
     AC_SUBST(TIX_BUILD_LIB_SPEC)
 dnl    AC_SUBST(TIX_LIB_SPEC)
 ])
+
+dnl sinclude(../gettext.m4) already included by bfd/acinclude.m4
+dnl The lines below arrange for aclocal not to bring gettext.m4's
+dnl CY_GNU_GETTEXT into aclocal.m4.
+ifelse(yes,no,[
+AC_DEFUN([CY_GNU_GETTEXT],)
+])