X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Faclocal.m4;h=7b546b75e9be9c0f4fd2ea28a4ec83b03c2826f2;hb=07b287a0d1bda52b43a2aec41838149cadb019c5;hp=19ba7edec847d724743741e1fc8f28631a48ca9d;hpb=5436fc6578fb8f0b84e2e2658cc20022dc607d8e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4 index 19ba7edec8..7b546b75e9 100644 --- a/gdb/aclocal.m4 +++ b/gdb/aclocal.m4 @@ -1,147 +1,109 @@ -AC_DEFUN(CYGNUS_PATH_TK, [ -# -# Ok, lets find the tk source trees so we can use the headers -# If the directory (presumably symlink) named "tk" exists, use that one -# in preference to any others. Same logic is used when choosing library -# and again with Tcl. -# -AC_CHECKING(for Tk source directory) -TKHDIR="" -for i in `ls -d ${srcdir}/../tk* 2>/dev/null` ${srcdir}/../tk ; do - if test -f $i/tk.h ; then - TKHDIR="-I$i" - fi -done -# if we can't find it, see if one is installed -if test x"$TKHDIR" = x ; then - installed=0 - if test -f $prefix/include/tk.h; then - installed=1 TKHDIR="-I$prefix/include" - else - AC_HEADER_CHECK(tk.h, installed=1) - fi - if test $installed -eq 0 ; then - TKHDIR="# no Tk directory found" - AC_MSG_WARN(Can't find Tk directory) - fi -fi -if test x"$TKHDIR" != x ; then - AC_MSG_RESULT(Setting TKHDIR to be $i) -fi +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- -# -# Ok, lets find the tk library -# First, look for one uninstalled. -# -TKLIB="" -AC_CHECKING(for Tk library) -for i in `ls -d ../tk* 2>/dev/null` ../tk ; do - if test -f "$i/Makefile" ; then - TKLIB=$i/libtk.a - fi -done -# If not found, look for installed version -if test x"$TKLIB" = x ; then -dnl This doesn't work because of unresolved symbols. -dnl AC_HAVE_LIBRARY(libtk.a, installed=1, installed=0) - if test -f $prefix/lib/libtk.a; then - installed=1 - else - installed=0 - fi - if test $installed -eq 1 ; then - TKLIB="-ltk" - fi -fi +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# If still not found, assume Tk simply hasn't been built yet -if test x"$TKLIB" = x ; then - for i in `ls -d ../tk* 2>/dev/null` ../tk ; do - if test -f "$i/tk.h" ; then - TKLIB=$i/libtk.a - fi - done -fi +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -if test x"$TKLIB" = x ; then - TKLIB="# no Tk library found" - AC_MSG_WARN(Can't find Tk library) -else - AC_MSG_RESULT(setting TKLIB to be $TKLIB) - no_tk= -fi +# AM_CONDITIONAL -*- Autoconf -*- -AC_SUBST(TKHDIR) -AC_SUBST(TKLIB) -]) +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 9 -AC_DEFUN(CYGNUS_PATH_TCL, [ -# -# Ok, lets find the tcl source trees so we can use the headers -# -# Warning: transition of version 9 to 10 will break this algorithm -# because 10 sorts before 9. -# -AC_CHECKING(for Tcl source directory) -TCLHDIR="" -for i in `ls -d ${srcdir}/../tcl* 2>/dev/null` ${srcdir}/../tcl ; do - if test -f $i/tclInt.h ; then - TCLHDIR="-I$i" - fi -done -# if we can't find it, see if one is installed -if test x"$TCLHDIR" = x ; then - installed=0 - if test -f $prefix/include/tclInt.h; then - installed=1 TCLHDIR="-I$prefix/include" - else - AC_HEADER_CHECK(tclInt.h, installed=1) - fi - if test $installed -eq 0 ; then - TCLHDIR="# no Tcl directory found" - AC_MSG_WARN(Can't find Tcl directory) - fi +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' else - AC_MSG_RESULT(setting TCLHDIR to be $i) + $1_TRUE='#' + $1_FALSE= fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # -# Ok, lets find the tcl library -# First, look for the latest uninstalled +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # -TCLLIB="" -AC_CHECKING(for Tcl library) -for i in `ls -d ../tcl* 2>/dev/null` ../tcl ; do - if test -f "$i/Makefile" ; then - TCLLIB=$i/libtcl.a - fi -done -# If not found, look for installed version -if test x"$TCLLIB" = x ; then -dnl Don't use this, since we can't use it for libtk.a. -dnl AC_HAVE_LIBRARY(libtcl.a, installed=1, installed=0) - if test -f $prefix/lib/libtcl.a; then installed=1; else installed=0; fi - if test $installed -eq 1 ; then - TCLLIB="-ltcl" - fi -fi -# If still not found, assume Tcl simply hasn't been built yet -if test x"$TCLLIB" = x ; then - for i in `ls -d ../tcl* 2>/dev/null` ../tcl ; do - if test -f "$i/tcl.h" ; then - TCLLIB=$i/libtcl.a - fi - done -fi +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -if test x"$TCLLIB" = x ; then - TCLLIB="# no Tcl library found" - AC_MSG_WARN(Can't find Tcl library) -else - AC_MSG_RESULT(setting TCLLIB to be $TCLLIB) -fi +# serial 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -AC_SUBST(TCLHDIR) -AC_SUBST(TCLLIB) -]) \ No newline at end of file +m4_include([acinclude.m4])