From 8e5ced631fd92b7f95b3ad4a5eda0237dccae422 Mon Sep 17 00:00:00 2001 From: jsm28 Date: Fri, 1 Apr 2011 13:44:53 +0000 Subject: [PATCH] * configure.ac: Remove code setting CONFIG_SHELL, config_shell and moveifchange. * configure: Regenerate. * Makefile.tpl: Use @SHELL@ not @config_shell@. * Makefile.in: Regenerate. --- ChangeLog | 8 ++++ Makefile.in | 154 +++++++++++++++++++++++++++-------------------------------- Makefile.tpl | 16 +------ configure | 38 --------------- configure.ac | 37 -------------- 5 files changed, 80 insertions(+), 173 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9dec4fb43..e696c6693e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-04-01 Joseph Myers + * configure.ac: Remove code setting CONFIG_SHELL, config_shell and + moveifchange. + * configure: Regenerate. + * Makefile.tpl: Use @SHELL@ not @config_shell@. + * Makefile.in: Regenerate. + +2011-04-01 Joseph Myers + * configure.ac (*-*-sysv4*): Don't enable libgomp. (alpha*-*-*vms*, i[[34567]]86-*-sco3.2v5*, mn10300-*-*, powerpc-*-chorusos*, powerpc*-*-eabi*, powerpc*-*-sysv*, diff --git a/Makefile.in b/Makefile.in index 660f813224..e64f076302 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,8 +100,6 @@ TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ tooldir = @tooldir@ build_tooldir = @build_tooldir@ -GDB_NLM_DEPS = - # This is the name of the environment variable used for the path to # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ @@ -322,7 +320,7 @@ HOST_LIBELFINC = @libelfinc@ # Programs producing files for the BUILD machine # ---------------------------------------------- -SHELL = @config_shell@ +SHELL = @SHELL@ # pwd command to use. Allow user to override default by setting PWDCMD in # the environment to account for automounters. The make variable must not @@ -796,18 +794,6 @@ EXTRA_HOST_FLAGS = \ FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) -# Flags that are concerned with the location of the X11 include files -# and library files -# -# NOTE: until the top-level is getting the values via autoconf, it only -# causes problems to have this top-level Makefile overriding the autoconf-set -# values in child directories. Only variables that don't conflict with -# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now. -# -X11_FLAGS_TO_PASS = \ - 'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \ - 'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)' - # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ @@ -42263,7 +42249,7 @@ all-gdb: configure-gdb s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ $(TARGET-gdb)) @endif gdb @@ -42281,7 +42267,7 @@ check-gdb: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check) @endif gdb @@ -42296,7 +42282,7 @@ install-gdb: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + $(MAKE) $(FLAGS_TO_PASS) install) @endif gdb @@ -42311,7 +42297,7 @@ install-strip-gdb: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install-strip) + $(MAKE) $(FLAGS_TO_PASS) install-strip) @endif gdb @@ -42329,7 +42315,7 @@ info-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gdb" ; \ @@ -42355,7 +42341,7 @@ dvi-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gdb" ; \ @@ -42381,7 +42367,7 @@ pdf-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing pdf in gdb" ; \ @@ -42407,7 +42393,7 @@ html-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing html in gdb" ; \ @@ -42433,7 +42419,7 @@ TAGS-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gdb" ; \ @@ -42460,7 +42446,7 @@ install-info-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gdb" ; \ @@ -42487,7 +42473,7 @@ install-pdf-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-pdf in gdb" ; \ @@ -42514,7 +42500,7 @@ install-html-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-html in gdb" ; \ @@ -42540,7 +42526,7 @@ installcheck-gdb: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gdb" ; \ @@ -42565,7 +42551,7 @@ mostlyclean-gdb: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gdb" ; \ @@ -42590,7 +42576,7 @@ clean-gdb: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gdb" ; \ @@ -42615,7 +42601,7 @@ distclean-gdb: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gdb" ; \ @@ -42640,7 +42626,7 @@ maintainer-clean-gdb: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gdb" ; \ @@ -42703,7 +42689,7 @@ all-expect: configure-expect s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ $(TARGET-expect)) @endif expect @@ -42721,7 +42707,7 @@ check-expect: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check) @endif expect @@ -42736,7 +42722,7 @@ install-expect: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + $(MAKE) $(FLAGS_TO_PASS) install) @endif expect @@ -42751,7 +42737,7 @@ install-strip-expect: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install-strip) + $(MAKE) $(FLAGS_TO_PASS) install-strip) @endif expect @@ -42769,7 +42755,7 @@ info-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in expect" ; \ @@ -42795,7 +42781,7 @@ dvi-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in expect" ; \ @@ -42821,7 +42807,7 @@ pdf-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing pdf in expect" ; \ @@ -42847,7 +42833,7 @@ html-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing html in expect" ; \ @@ -42873,7 +42859,7 @@ TAGS-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in expect" ; \ @@ -42900,7 +42886,7 @@ install-info-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in expect" ; \ @@ -42927,7 +42913,7 @@ install-pdf-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-pdf in expect" ; \ @@ -42954,7 +42940,7 @@ install-html-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-html in expect" ; \ @@ -42980,7 +42966,7 @@ installcheck-expect: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in expect" ; \ @@ -43005,7 +42991,7 @@ mostlyclean-expect: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in expect" ; \ @@ -43030,7 +43016,7 @@ clean-expect: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in expect" ; \ @@ -43055,7 +43041,7 @@ distclean-expect: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in expect" ; \ @@ -43080,7 +43066,7 @@ maintainer-clean-expect: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in expect" ; \ @@ -43143,7 +43129,7 @@ all-guile: configure-guile s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ $(TARGET-guile)) @endif guile @@ -43161,7 +43147,7 @@ check-guile: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check) @endif guile @@ -43176,7 +43162,7 @@ install-guile: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + $(MAKE) $(FLAGS_TO_PASS) install) @endif guile @@ -43191,7 +43177,7 @@ install-strip-guile: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install-strip) + $(MAKE) $(FLAGS_TO_PASS) install-strip) @endif guile @@ -43209,7 +43195,7 @@ info-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in guile" ; \ @@ -43235,7 +43221,7 @@ dvi-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in guile" ; \ @@ -43261,7 +43247,7 @@ pdf-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing pdf in guile" ; \ @@ -43287,7 +43273,7 @@ html-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing html in guile" ; \ @@ -43313,7 +43299,7 @@ TAGS-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in guile" ; \ @@ -43340,7 +43326,7 @@ install-info-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in guile" ; \ @@ -43367,7 +43353,7 @@ install-pdf-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-pdf in guile" ; \ @@ -43394,7 +43380,7 @@ install-html-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-html in guile" ; \ @@ -43420,7 +43406,7 @@ installcheck-guile: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in guile" ; \ @@ -43445,7 +43431,7 @@ mostlyclean-guile: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in guile" ; \ @@ -43470,7 +43456,7 @@ clean-guile: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in guile" ; \ @@ -43495,7 +43481,7 @@ distclean-guile: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in guile" ; \ @@ -43520,7 +43506,7 @@ maintainer-clean-guile: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in guile" ; \ @@ -43583,7 +43569,7 @@ all-tk: configure-tk s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ $(TARGET-tk)) @endif tk @@ -43601,7 +43587,7 @@ check-tk: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) check) @endif tk @@ -43616,7 +43602,7 @@ install-tk: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + $(MAKE) $(FLAGS_TO_PASS) install) @endif tk @@ -43631,7 +43617,7 @@ install-strip-tk: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install-strip) + $(MAKE) $(FLAGS_TO_PASS) install-strip) @endif tk @@ -43649,7 +43635,7 @@ info-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in tk" ; \ @@ -43675,7 +43661,7 @@ dvi-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in tk" ; \ @@ -43701,7 +43687,7 @@ pdf-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing pdf in tk" ; \ @@ -43727,7 +43713,7 @@ html-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing html in tk" ; \ @@ -43753,7 +43739,7 @@ TAGS-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in tk" ; \ @@ -43780,7 +43766,7 @@ install-info-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in tk" ; \ @@ -43807,7 +43793,7 @@ install-pdf-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-pdf in tk" ; \ @@ -43834,7 +43820,7 @@ install-html-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-html in tk" ; \ @@ -43860,7 +43846,7 @@ installcheck-tk: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in tk" ; \ @@ -43885,7 +43871,7 @@ mostlyclean-tk: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in tk" ; \ @@ -43910,7 +43896,7 @@ clean-tk: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in tk" ; \ @@ -43935,7 +43921,7 @@ distclean-tk: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in tk" ; \ @@ -43960,7 +43946,7 @@ maintainer-clean-tk: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in tk" ; \ @@ -60536,6 +60522,7 @@ all-stage3-lto-plugin: maybe-all-stage3-libiberty all-stage4-lto-plugin: maybe-all-stage4-libiberty all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty +all-utils: maybe-all-libiberty configure-mpfr: maybe-all-gmp configure-stage1-mpfr: maybe-all-stage1-gmp @@ -60588,6 +60575,7 @@ all-gdb: maybe-all-build-bison all-gdb: maybe-all-build-byacc all-gdb: maybe-all-sim all-gdb: maybe-all-libdecnumber +all-gdb: maybe-all-libtermcap configure-libgui: maybe-configure-tcl configure-libgui: maybe-configure-tk all-libgui: maybe-all-tcl diff --git a/Makefile.tpl b/Makefile.tpl index 7ad089616b..f7312d9e8c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -103,8 +103,6 @@ TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ tooldir = @tooldir@ build_tooldir = @build_tooldir@ -GDB_NLM_DEPS = - # This is the name of the environment variable used for the path to # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ @@ -325,7 +323,7 @@ HOST_LIBELFINC = @libelfinc@ # Programs producing files for the BUILD machine # ---------------------------------------------- -SHELL = @config_shell@ +SHELL = @SHELL@ # pwd command to use. Allow user to override default by setting PWDCMD in # the environment to account for automounters. The make variable must not @@ -608,18 +606,6 @@ EXTRA_HOST_FLAGS = \ FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) -# Flags that are concerned with the location of the X11 include files -# and library files -# -# NOTE: until the top-level is getting the values via autoconf, it only -# causes problems to have this top-level Makefile overriding the autoconf-set -# values in child directories. Only variables that don't conflict with -# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now. -# -X11_FLAGS_TO_PASS = \ - 'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \ - 'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)' - # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ diff --git a/configure b/configure index 46e9caeffc..fea4aa70e0 100755 --- a/configure +++ b/configure @@ -604,7 +604,6 @@ LEX M4 BISON YACC -config_shell WINDRES_FOR_BUILD WINDMC_FOR_BUILD RANLIB_FOR_BUILD @@ -2608,42 +2607,6 @@ fi done -### we might need to use some other shell than /bin/sh for running subshells -### If we are on Windows, search for the shell. This will permit people -### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure -### without also having to set CONFIG_SHELL. This code will work when -### using bash, which sets OSTYPE. -case "${OSTYPE}" in -*win32*) - if test x${CONFIG_SHELL} = x ; then - if test ! -f /bin/sh ; then - if test x${SHELL} != x && test -f ${SHELL} ; then - CONFIG_SHELL=${SHELL} - export CONFIG_SHELL - else - for prog in sh sh.exe bash bash.exe; do - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$prog; then - CONFIG_SHELL=$dir/$prog - export CONFIG_SHELL - break - fi - done - IFS="$save_ifs" - test -n "${CONFIG_SHELL}" && break - done - fi - fi - fi - ;; -esac - -config_shell=${CONFIG_SHELL-/bin/sh} - -moveifchange=${srcdir}/move-if-change - srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}` # We pass INSTALL explicitly to sub-makes. Make sure that it is not @@ -7507,7 +7470,6 @@ done - # Generate default definitions for YACC, M4, LEX and other programs that run # on the build machine. These are used if the Makefile can't locate these # programs in objdir. diff --git a/configure.ac b/configure.ac index 32df4932cb..2564ce5ad3 100644 --- a/configure.ac +++ b/configure.ac @@ -89,42 +89,6 @@ AC_PROG_LN_S AC_PROG_SED AC_PROG_AWK -### we might need to use some other shell than /bin/sh for running subshells -### If we are on Windows, search for the shell. This will permit people -### to not have /bin/sh, but to be able to see /SOME/PATH/sh configure -### without also having to set CONFIG_SHELL. This code will work when -### using bash, which sets OSTYPE. -case "${OSTYPE}" in -*win32*) - if test x${CONFIG_SHELL} = x ; then - if test ! -f /bin/sh ; then - if test x${SHELL} != x && test -f ${SHELL} ; then - CONFIG_SHELL=${SHELL} - export CONFIG_SHELL - else - for prog in sh sh.exe bash bash.exe; do - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$prog; then - CONFIG_SHELL=$dir/$prog - export CONFIG_SHELL - break - fi - done - IFS="$save_ifs" - test -n "${CONFIG_SHELL}" && break - done - fi - fi - fi - ;; -esac - -config_shell=${CONFIG_SHELL-/bin/sh} - -moveifchange=${srcdir}/move-if-change - srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}` # We pass INSTALL explicitly to sub-makes. Make sure that it is not @@ -2985,7 +2949,6 @@ AC_SUBST(NM_FOR_BUILD) AC_SUBST(RANLIB_FOR_BUILD) AC_SUBST(WINDMC_FOR_BUILD) AC_SUBST(WINDRES_FOR_BUILD) -AC_SUBST(config_shell) # Generate default definitions for YACC, M4, LEX and other programs that run # on the build machine. These are used if the Makefile can't locate these -- 2.11.0