From 5d8b7982c55c05af9ab519a5f84868f72689b0ef Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Tue, 25 Jun 1996 13:08:00 +0000 Subject: [PATCH] * Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir): Use autoconf set values. (docdir): Removed. * configure.in (AC_PREREQ): autoconf 2.5 or higher. * nlm/Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir): Use autoconf set values. (docdir): Removed. * nlm/configure.in (AC_PREREQ): autoconf 2.5 or higher. * nlm/configure: Rebuilt. * gdb/gdbserver/Makefile.in (datadir): Set to $(prefix)/share. --- gdb/ChangeLog | 25 +++++++ gdb/Makefile.in | 17 ++--- gdb/configure.in | 2 +- gdb/gdbserver/Makefile.in | 130 ++++++++++++--------------------- gdb/nlm/Makefile.in | 13 ++-- gdb/nlm/configure | 181 ++++++++++++++++++++++++++++++++++++++++------ gdb/nlm/configure.in | 2 +- 7 files changed, 245 insertions(+), 125 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9516c86..893688f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,28 @@ +Tue Jun 25 22:05:38 1996 Jason Molenda (crash@godzilla.cygnus.co.jp) + + * Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir): + Use autoconf set values. + (docdir): Removed. + * configure.in (AC_PREREQ): autoconf 2.5 or higher. + * nlm/Makefile.in (bindir, libdir, datadir, mandir, infodir, + includedir): Use autoconf set values. + (docdir): Removed. + * nlm/configure.in (AC_PREREQ): autoconf 2.5 or higher. + * nlm/configure: Rebuilt. + * gdb/gdbserver/Makefile.in (datadir): Set to $(prefix)/share. + +Mon Jun 24 09:56:14 1996 Angela Marie Thomas (angela@cygnus.com) + + * stabsread.c (read_cfront_member_functions): add type + +Sun Jun 23 23:40:48 1996 Doug Evans + + * win32-nat.c: #include . + (unix_paths_to_dos_paths, dos_paths_to_unix_paths): Delete. + (child_create_inferior): Convert only env var PATH to win32 style. + (set_pathstyle_dos): Delete. + (_initialize_inftarg): Delete dos-path-style command. + start-sanitize-gdbtk Fri Jun 21 11:04:47 1996 Fred Fish diff --git a/gdb/Makefile.in b/gdb/Makefile.in index be49ae5..8f68355 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -23,12 +23,12 @@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ target_alias = @target_alias@ program_transform_name = @program_transform_name@ -bindir = $(exec_prefix)/bin -libdir = $(exec_prefix)/lib +bindir = @bindir@ +libdir = @libdir@ tooldir = $(libdir)/$(target_alias) -datadir = $(prefix)/lib -mandir = $(prefix)/man +datadir = @datadir@ +mandir = @mandir@ man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 man3dir = $(mandir)/man3 @@ -38,9 +38,8 @@ man6dir = $(mandir)/man6 man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -infodir = $(prefix)/info -includedir = $(prefix)/include -docdir = $(datadir)/doc +infodir = @infodir@ +includedir = @includedir@ SHELL = /bin/sh @@ -181,7 +180,7 @@ INTERNAL_CFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \ # Profiling options need to go here to work. # I think it's perfectly reasonable for a user to set -pg in CFLAGS # and have it work; that's why CFLAGS is here. -INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) $(LDFLAGS) +INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) $(LDFLAGS) @CONFIG_LDFLAGS@ # We are using our own version of REGEX now to be consistent across # machines. @@ -450,7 +449,7 @@ POSSLIBS = gnu-regex.c gnu-regex.h # Makefile.in DEPFILES = $(TDEPFILES) $(XDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \ - $(REMOTE_OBS) $(SIM_OBS) $(ENABLE_OBS) + $(REMOTE_OBS) $(SIM_OBS) $(ENABLE_OBS) @THREAD_DB_OBS@ SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) # Don't include YYFILES (*.tab.c) because we already include *.y in SFILES, diff --git a/gdb/configure.in b/gdb/configure.in index a9a4f56..2390b46 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.3)dnl +AC_PREREQ(2.5)dnl AC_INIT(main.c) AC_CONFIG_HEADER(config.h:config.in) diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 90db83f..ee6fab8 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. prefix = /usr/local @@ -24,7 +24,7 @@ bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib tooldir = $(libdir)/$(target_alias) -datadir = $(prefix)/lib +datadir = $(prefix)/share mandir = $(prefix)/man man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 @@ -41,23 +41,16 @@ docdir = $(datadir)/doc SHELL = /bin/sh -INSTALL = install -c +INSTALL = `cd $(srcdir)/../..;pwd`/install.sh -c INSTALL_PROGRAM = $(INSTALL) INSTALL_DATA = $(INSTALL) +INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)' +INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1 AR = ar AR_FLAGS = qv RANLIB = ranlib -# Flags that describe where you can find the termcap library. -# This can be overridden in the host Makefile fragment file. -TERMCAP = -ltermcap - -# System V: If you compile gdb with a compiler which uses the coff -# encapsulation feature (this is a function of the compiler used, NOT -# of the m-?.h file selected by config.gdb), you must make sure that -# the GNU nm is the one that is used by munch. - # If you are compiling with GCC, make sure that either 1) You use the # -traditional flag, or 2) You have the fixed include files where GCC # can reach them. Otherwise the ioctl calls in inflow.c @@ -75,17 +68,6 @@ srcdir = . # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which # is where it should be according to Posix). -# If you use bison instead of yacc, it needs to include the "-y" argument. -#BISON=bison -y -BISON=yacc -YACC=$(BISON) - -# where to find texinfo; GDB dist should include a recent one -TEXIDIR=${srcdir}/../texinfo - -# where to find makeinfo, preferably one designed for texinfo-2 -MAKEINFO=makeinfo - # Set this up with gcc if you have gnu ld and the loader will print out # line numbers for undefinded refs. #CC-LD=gcc -static @@ -100,13 +82,19 @@ INCLUDE_DEP = $$(INCLUDE_DIR) # ${MMALLOC_DIR}${subdir}.) # Note that mmalloc can still be used on systems without mmap(). # To use your system malloc, comment out the following defines. -MMALLOC_DIR = ${srcdir}/../mmalloc +MMALLOC_DIR = ${srcdir}/../../mmalloc MMALLOC_DEP = $$(MMALLOC_DIR) # To use your system malloc, uncomment MMALLOC_DISABLE. #MMALLOC_DISABLE = -DNO_MMALLOC # To use mmalloc but disable corruption checking, uncomment MMALLOC_CHECK #MMALLOC_CHECK = -DNO_MMALLOC_CHECK -MMALLOC_CFLAGS = ${MMALLOC_CHECK} ${MMALLOC_DISABLE} +MMALLOC_CFLAGS = ${MMALLOC_CHECK} ${MMALLOC_DISABLE} -I${MMALLOC_DIR} + +# Where are the BFD library? +BFD_DIR = ../../bfd +BFD = $(BFD_DIR)/libbfd.a +BFD_SRC = $(srcdir)/$(BFD_DIR) +BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC) # Where is the source dir for the READLINE library? Traditionally in .. or . # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.) @@ -128,15 +116,18 @@ GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS} # when running make. I.E. "make CFLAGS=-Wmissing-prototypes". CFLAGS = -g # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS = ${CFLAGS} ${GLOBAL_CFLAGS} ${PROFILE_CFLAGS} ${MMALLOC_CFLAGS} ${INCLUDE_CFLAGS} ${USER_CFLAGS} -LDFLAGS = $(CFLAGS) +INTERNAL_CFLAGS = ${CFLAGS} ${GLOBAL_CFLAGS} ${PROFILE_CFLAGS} \ + ${BFD_CFLAGS} ${MMALLOC_CFLAGS} ${INCLUDE_CFLAGS} + +# LDFLAGS is specifically reserved for setting from the command line +# when running make. # Perhaps should come from parent Makefile -VERSION = gdbserver-4.9.1 +VERSION = gdbserver-4.12.3 DIST=gdb LINT=/usr/5bin/lint -LINTFLAGS= -I${BFD_DIR} +LINTFLAGS= $(BFD_CFLAGS) # Host and target-dependent makefile fragments come in here. #### @@ -145,11 +136,12 @@ LINTFLAGS= -I${BFD_DIR} # All source files that go into linking GDB remote server. SFILES = $(srcdir)/low-lynx.c $(srcdir)/low-sparc.c $(srcdir)/low-sun3.c \ + $(srcdir)/low-hppabsd.c \ $(srcdir)/utils.c $(srcdir)/server.c $(srcdir)/remote-utils.c DEPFILES = $(GDBSERVER_DEPFILES) -SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) +SOURCES = $(SFILES) $(ALLDEPFILES) TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS} OBS = utils.o $(GDBSERVER_DEPFILES) server.o remote-utils.o @@ -159,7 +151,20 @@ OBS = utils.o $(GDBSERVER_DEPFILES) server.o remote-utils.o .c.o: ${CC} -c ${INTERNAL_CFLAGS} $< -all: gdbserver +all: gdbserver gdbreplay + +# Traditionally "install" depends on "all". But it may be useful +# not to; for example, if the user has made some trivial change to a +# source file and doesn't care about rebuilding or just wants to save the +# time it takes for make to check that all is up to date. +# install-only is intended to address that need. +install: all install-only +install-only: + $(INSTALL_XFORM) gdbserver $(bindir)/gdbserver + $(INSTALL_XFORM1) $(srcdir)/gdbserver.1 $(man1dir)/gdbserver.1 + +uninstall: force + rm -f $(bindir)/gdbserver $(man1dir)/gdbserver.1 installcheck: check: @@ -168,6 +173,7 @@ install-info: clean-info: gdbserver: $(OBS) ${ADD_DEPS} ${CDEPS} + rm -f gdbserver ${CC-LD} $(GLOBAL_CFLAGS) $(LDFLAGS) -o gdbserver $(OBS) \ $(GDBSERVER_LIBS) @@ -179,9 +185,9 @@ config.status: # specific routine gets the one for the correct machine. # The xyzzy stuff below deals with empty DEPFILES TAGS: ${TAGFILES} - etags `find ${srcdir}/config -name $(TM_FILE) -print` \ - `find ${srcdir}/config -name ${XM_FILE} -print` \ - `find ${srcdir}/config -name ${NAT_FILE} -print` \ + etags `find ${srcdir}/../config -name $(TM_FILE) -print` \ + `find ${srcdir}/../config -name ${XM_FILE} -print` \ + `find ${srcdir}/../config -name ${NAT_FILE} -print` \ `for i in yzzy ${DEPFILES}; do \ if [ x$$i != xyzzy ]; then \ echo ${srcdir}/$$i | sed -e 's/\.o$$/\.c/' ; \ @@ -190,63 +196,16 @@ TAGS: ${TAGFILES} ${TAGFILES} tags: TAGS -# Making distributions of GDB and friends. - -# Make a tar file containing the GDB directory of the distribution. -gdb.tar.Z: force_update - $(MAKE) $(MFLAGS) -f Makefile.in setup-to-dist - $(MAKE) $(MFLAGS) -f Makefile.in gdb-$(VERSION).tar.Z - -# Make a directory `proto-gdb.dir' that contains an image of the GDB -# directory of the distribution, built up with symlinks. Note that this -# make target is not directly referenced by any other rules in this makefile, -# it is referenced by the makefile in the parent directory. -make-proto-gdb.dir: force_update - $(MAKE) $(MFLAGS) -f Makefile.in setup-to-dist - $(MAKE) $(MFLAGS) -f Makefile make-proto-gdb-1 - -# Set up the GDB source directory for distribution, by building all files that -# are products of other files. -setup-to-dist: update-depend force_update - ../configure none - (cd doc; $(MAKE) $(MFLAGS) GDBvn.texi) - $(MAKE) $(MFLAGS) gdb.info - $(MAKE) $(MFLAGS) refcard.ps - -# Update the "depend" and "alldeps.mak" files in a source directory. -# We update alldeps.mak first, since it is used to generate the list -# of files to be checked for dependencies. -update-depend: update-alldeps force_update - ../configure none -norecursion - rm -f depend - $(MAKE) $(MFLAGS) depend - -# Update the "alldeps.mak" file in a source directory. -update-alldeps: force_update - ../configure none -norecursion - rm -f alldeps.mak - $(MAKE) $(MFLAGS) alldeps.mak - -# Build a tar file from a proto-gdb.dir. -gdb-$(VERSION).tar.Z: force_update - rm -f gdb.tar gdb-$(VERSION).tar.Z - $(MAKE) $(MFLAGS) -f Makefile make-proto-gdb-1 - ln -s proto-gdb.dir $(DIST) - tar chf - $(DIST) | compress >gdb-$(VERSION).tar.Z - rm -rf $(DIST) proto-gdb.dir - clean: rm -f *.o ${ADD_FILES} *~ - rm -f init.c version.c rm -f gdbserver core make.log -distclean: clean c-exp.tab.c m2-exp.tab.c ch-exp.tab.c TAGS - rm -f tm.h xm.h config.status +distclean: clean + rm -f nm.h tm.h xm.h config.status rm -f Makefile -realclean: clean - rm -f c-exp.tab.c m2-exp.tab.c ch-exp.tab.c TAGS - rm -f tm.h xm.h config.status +maintainer-clean realclean: clean + rm -f nm.h tm.h xm.h config.status rm -f Makefile STAGESTUFF=${OBS} ${TSOBS} ${NTSOBS} ${ADD_FILES} init.c init.o version.c gdb @@ -280,6 +239,7 @@ remote-utils.o : ${srcdir}/remote-utils.c ${srcdir}/server.h low-lynx.o : ${srcdir}/low-lynx.c ${srcdir}/server.h low-sparc.o : $(srcdir)/low-sparc.c $(srcdir)/server.h low-sun3.o : $(srcdir)/low-sun3.c $(srcdir)/server.h +low-hppabsd.o : $(srcdir)/low-hppabsd.c $(srcdir)/server.h utils.o : ${srcdir}/utils.c ${srcdir}/server.h # This is the end of "Makefile.in". diff --git a/gdb/nlm/Makefile.in b/gdb/nlm/Makefile.in index c17bcff..af1f7f8 100644 --- a/gdb/nlm/Makefile.in +++ b/gdb/nlm/Makefile.in @@ -25,12 +25,12 @@ exec_prefix = @exec_prefix@ host_alias = @host_alias@ target_alias = @target_alias@ program_transform_name = @program_transform_name@ -bindir = $(exec_prefix)/bin -libdir = $(exec_prefix)/lib +bindir = @bindir@ +libdir = @libdir@ tooldir = $(libdir)/$(target_alias) -datadir = $(prefix)/lib -mandir = $(prefix)/man +datadir = @datadir@ +mandir = @mandir@ man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 man3dir = $(mandir)/man3 @@ -40,9 +40,8 @@ man6dir = $(mandir)/man6 man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -infodir = $(prefix)/info -includedir = $(prefix)/include -docdir = $(datadir)/doc +infodir = @infodir@ +includedir = @includedir@ SHELL = /bin/sh diff --git a/gdb/nlm/configure b/gdb/nlm/configure index 0b62dc1..9e73964 100755 --- a/gdb/nlm/configure +++ b/gdb/nlm/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.3 -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Generated automatically using autoconf version 2.10 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -33,9 +33,22 @@ target=NONE verbose= x_includes=NONE x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' # Initialize some other variables. subdirs= +MFLAGS= MAKEFLAGS= ac_prev= for ac_option @@ -57,9 +70,14 @@ do case "$ac_option" in - -build | --build | --buil | --bui | --bu | --b) + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*) + -build=* | --build=* | --buil=* | --bui=* | --bu=*) build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ @@ -69,6 +87,12 @@ do | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) cache_file="$ac_optarg" ;; + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + -disable-* | --disable-*) ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. @@ -119,12 +143,29 @@ Configuration: Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=PREFIX install architecture-dependent files in PREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -136,8 +177,10 @@ Features and packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR ---enable and --with options recognized:$ac_help EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi exit 0 ;; -host | --host | --hos | --ho) @@ -145,6 +188,44 @@ EOF -host=* | --host=* | --hos=* | --ho=*) host="$ac_optarg" ;; + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; @@ -157,6 +238,15 @@ EOF | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) no_recursion=yes ;; + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) @@ -197,6 +287,23 @@ EOF | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) @@ -207,6 +314,13 @@ EOF -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) srcdir="$ac_optarg" ;; + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + -target | --target | --targe | --targ | --tar | --ta | --t) ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) @@ -216,7 +330,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.3" + echo "configure generated by autoconf version 2.10" exit 0 ;; -with-* | --with-*) @@ -262,7 +376,7 @@ EOF -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *) + *) if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then echo "configure: warning: $ac_option: invalid host type" 1>&2 fi @@ -382,8 +496,8 @@ fi ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. @@ -425,7 +539,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # # The rules are: # 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. +# same time. # 2. Host defaults to nonopt. # 3. If nonopt is not specified, then host defaults to the current host, # as determined by config.guess. @@ -507,8 +621,10 @@ test "$host_alias" != "$target_alias" && if test "$program_transform_name" = s,x,x,; then program_transform_name= else - # Double any \ or $. - echo 's,\\,\\\\,g; s,\$,$$,g' > conftestsed + # Double any \ or $. echo might interpret backslashes. + cat <<\EOF_SED > conftestsed +s,\\,\\\\,g; s,\$,$$,g +EOF_SED program_transform_name="`echo $program_transform_name|sed -f conftestsed`" rm -f conftestsed fi @@ -561,10 +677,17 @@ else esac done IFS="$ac_save_ifs" - # As a last resort, use the slow shell script. - test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh" + fi - INSTALL="$ac_cv_path_install" + if test "${ac_cv_path_install+set}" = set; then + INSTALL="$ac_cv_path_install" + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi fi echo "$ac_t""$INSTALL" 1>&6 @@ -665,7 +788,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g s%\[%\\&%g s%\]%\\&%g @@ -700,7 +823,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.3" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -712,10 +835,12 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\CEOF +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub s%@CFLAGS@%$CFLAGS%g @@ -727,6 +852,18 @@ s%@LIBS@%$LIBS%g s%@exec_prefix@%$exec_prefix%g s%@prefix@%$prefix%g s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g diff --git a/gdb/nlm/configure.in b/gdb/nlm/configure.in index f70be82..97c9d73 100644 --- a/gdb/nlm/configure.in +++ b/gdb/nlm/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.3)dnl +AC_PREREQ(2.5)dnl AC_INIT(gdbserve.c) AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..) -- 2.7.4