From 15ae1beecfb3909bbbf0175722ca2ef53d35a23f Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Mon, 24 Feb 1997 23:35:55 +0000 Subject: [PATCH] * configure.in: Added AM_MAINTAINER_MODE Makefile.in, aclocal.m4, configure: Regenerated --- ChangeLog | 4 + Makefile.in | 9 +- aclocal.m4 | 23 ++++ configure | 28 +++- configure.in | 1 + ice-9/ChangeLog | 4 + ice-9/Makefile.in | 11 +- ice-9/aclocal.m4 | 23 ++++ ice-9/configure | 28 +++- ice-9/configure.in | 7 - libguile/ChangeLog | 8 ++ libguile/Makefile.in | 69 +++++----- libguile/aclocal.m4 | 31 ++++- libguile/configure | 311 +++++++++++++++++++++++------------------- libguile/configure.in | 1 + qt/ChangeLog | 4 + qt/Makefile.in | 25 ++-- qt/aclocal.m4 | 23 ++++ qt/configure | 74 ++++++---- qt/configure.in | 77 ----------- qt/md/Makefile.in | 21 +-- qt/time/Makefile.in | 21 +-- 22 files changed, 469 insertions(+), 334 deletions(-) rewrite qt/configure.in (100%) diff --git a/ChangeLog b/ChangeLog index 4d119ccf0..3930582ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 24 21:43:26 1997 Mikael Djurfeldt + + * configure.in: Added AM_MAINTAINER_MODE + Fri Feb 7 17:57:46 1997 Jim Blandy * config.sub, config.guess: New versions, that handle i686, etc. diff --git a/Makefile.in b/Makefile.in index b02c76337..de3de9db2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,10 +37,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +VERSION = @VERSION@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ PACKAGE = @PACKAGE@ +MAINT = @MAINT@ existingdirs = @existingdirs@ -VERSION = @VERSION@ SUBDIRS = @existingdirs@ doc newdoc @@ -67,19 +68,19 @@ TAR = tar default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/aclocal.m4: configure.in +$(srcdir)/aclocal.m4: @MAINT@configure.in cd $(srcdir) && aclocal config.status: configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && autoconf install-aclocalDATA: $(aclocal_DATA) diff --git a/aclocal.m4 b/aclocal.m4 index e18720fd8..0a6f6559e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -50,3 +50,26 @@ fi rm -f conftest* AC_MSG_RESULT(yes)]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + AC_SUBST(MAINT)dnl +] +) + diff --git a/configure b/configure index ea57520e3..ae0e40870 100755 --- a/configure +++ b/configure @@ -11,6 +11,9 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -549,7 +552,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:553: checking for a BSD compatible install" >&5 +echo "configure:556: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -615,7 +618,7 @@ cat >> confdefs.h <&6 -echo "configure:619: checking whether build environment is sane" >&5 +echo "configure:622: checking whether build environment is sane" >&5 echo timestamp > conftestfile # Do this in a subshell so we don't clobber the current shell's # arguments. FIXME: maybe try `-L' hack like GETLOADAVG test? @@ -649,7 +652,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:653: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:656: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -675,6 +678,24 @@ else SET_MAKE="MAKE=${MAKE-make}" fi +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:683: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + + all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo` req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo` @@ -846,6 +867,7 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g s%@SET_MAKE@%$SET_MAKE%g +s%@MAINT@%$MAINT%g s%@subdirs@%$subdirs%g s%@existingdirs@%$existingdirs%g diff --git a/configure.in b/configure.in index c11e3b391..715a6b66c 100644 --- a/configure.in +++ b/configure.in @@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce configure. AC_INIT(Makefile.in) . $srcdir/GUILE-VERSION AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AM_MAINTAINER_MODE dnl FIXME: tsort, xargs not GNU standard. all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo` diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index ecbb2fb5f..0bafe07c6 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 24 21:46:15 1997 Mikael Djurfeldt + + * configure.in: Added AM_MAINTAINER_MODE + Sat Feb 15 04:51:20 1997 Gary Houston * boot-9.scm (read-sharp): define directly, don't go through a diff --git a/ice-9/Makefile.in b/ice-9/Makefile.in index c8fd1686b..2034d01b5 100644 --- a/ice-9/Makefile.in +++ b/ice-9/Makefile.in @@ -37,10 +37,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -PACKAGE = @PACKAGE@ VERSION = @VERSION@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ module = @module@ +PACKAGE = @PACKAGE@ +MAINT = @MAINT@ AUTOMAKE_OPTIONS = foreign @@ -65,19 +66,19 @@ TAR = tar default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/aclocal.m4: configure.in +$(srcdir)/aclocal.m4: @MAINT@configure.in cd $(srcdir) && aclocal config.status: configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && autoconf install-subpkgdataDATA: $(subpkgdata_DATA) diff --git a/ice-9/aclocal.m4 b/ice-9/aclocal.m4 index ace866913..3600eda2e 100644 --- a/ice-9/aclocal.m4 +++ b/ice-9/aclocal.m4 @@ -62,3 +62,26 @@ fi rm -f conftest* AC_MSG_RESULT(yes)]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + AC_SUBST(MAINT)dnl +] +) + diff --git a/ice-9/configure b/ice-9/configure index 4676147d1..8df2730de 100755 --- a/ice-9/configure +++ b/ice-9/configure @@ -11,6 +11,9 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -548,7 +551,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:552: checking for a BSD compatible install" >&5 +echo "configure:555: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -616,7 +619,7 @@ cat >> confdefs.h <&6 -echo "configure:620: checking whether build environment is sane" >&5 +echo "configure:623: checking whether build environment is sane" >&5 echo timestamp > conftestfile # Do this in a subshell so we don't clobber the current shell's # arguments. FIXME: maybe try `-L' hack like GETLOADAVG test? @@ -650,7 +653,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:654: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:657: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -697,6 +700,24 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. module=ice-9 +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:705: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -847,6 +868,7 @@ s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g s%@SET_MAKE@%$SET_MAKE%g s%@module@%$module%g +s%@MAINT@%$MAINT%g CEOF EOF diff --git a/ice-9/configure.in b/ice-9/configure.in index b2d4c334b..e69de29bb 100644 --- a/ice-9/configure.in +++ b/ice-9/configure.in @@ -1,7 +0,0 @@ -# -# Process this file with autoconf to produce a configure script. -# - -AC_INIT(boot-9.scm) -AM_INIT_GUILE_MODULE(ice-9) -AC_OUTPUT(Makefile) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index fafb1597c..51a031853 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 25 00:14:10 1997 Mikael Djurfeldt + + * unif.c (scm_init_unif): Added #include "unif.x". (There are two + scm_init_unif in this file. This will also fix a previous problem + with guile-snarf.) + + * configure.in: Added AM_MAINTAINER_MODE + Fri Feb 21 23:07:26 1997 Mikael Djurfeldt * gdb_interface.h (GDB_INTERFACE): Added some (void *) casts to diff --git a/libguile/Makefile.in b/libguile/Makefile.in index 2932e089e..f18033012 100644 --- a/libguile/Makefile.in +++ b/libguile/Makefile.in @@ -37,20 +37,21 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -host_triplet = @host@ host_alias = @host_alias@ -ERRNO_EXTRACT = @ERRNO_EXTRACT@ -FD_SETTER = @FD_SETTER@ -LIBLOBJS = @LIBLOBJS@ -AWK = @AWK@ +host_triplet = @host@ +RANLIB = @RANLIB@ LIBTOOL = @LIBTOOL@ -VERSION = @VERSION@ +AWK = @AWK@ module = @module@ +LIBLOBJS = @LIBLOBJS@ CC = @CC@ -RANLIB = @RANLIB@ +PACKAGE = @PACKAGE@ +ERRNO_EXTRACT = @ERRNO_EXTRACT@ +FD_SETTER = @FD_SETTER@ +VERSION = @VERSION@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ xtra_PLUGIN_guile_libs = @xtra_PLUGIN_guile_libs@ -PACKAGE = @PACKAGE@ +MAINT = @MAINT@ AUTOMAKE_OPTIONS = foreign @@ -132,7 +133,7 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ DATA = $(modinclude_DATA) -HEADERS = $(include_HEADERS) $(modinclude_HEADERS) +HEADERS = $(modinclude_HEADERS) $(include_HEADERS) DIST_COMMON = COPYING ChangeLog Makefile.am Makefile.in acconfig.h \ acinclude.m4 aclocal.m4 configure configure.in fd.h.in guile-snarf.in \ @@ -167,19 +168,19 @@ default: all .SUFFIXES: .SUFFIXES: .c .o .lo .x -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/aclocal.m4: configure.in acinclude.m4 +$(srcdir)/aclocal.m4: @MAINT@configure.in acinclude.m4 cd $(srcdir) && aclocal config.status: configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && autoconf $(CONFIG_HEADER): stamp-h @@ -188,7 +189,7 @@ stamp-h: $(CONFIG_HEADER_IN) $(top_builddir)/config.status && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) \ $(SHELL) ./config.status @echo timestamp > stamp-h -$(srcdir)/$(CONFIG_HEADER_IN): stamp-h.in +$(srcdir)/$(CONFIG_HEADER_IN): @MAINT@stamp-h.in $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL) acconfig.h cd $(top_srcdir) && autoheader echo timestamp > $(srcdir)/stamp-h.in @@ -296,19 +297,6 @@ uninstall-modincludeDATA: rm -f $(modincludedir)/$$p; \ done -install-includeHEADERS: $(include_HEADERS) - $(NORMAL_INSTALL) - $(mkinstalldirs) $(includedir) - @list="$(include_HEADERS)"; for p in $$list; do \ - echo "$(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \ - done - -uninstall-includeHEADERS: - list="$(include_HEADERS)"; for p in $$list; do \ - rm -f $(includedir)/$$p; \ - done - install-modincludeHEADERS: $(modinclude_HEADERS) $(NORMAL_INSTALL) $(mkinstalldirs) $(modincludedir) @@ -322,6 +310,19 @@ uninstall-modincludeHEADERS: rm -f $(modincludedir)/$$p; \ done +install-includeHEADERS: $(include_HEADERS) + $(NORMAL_INSTALL) + $(mkinstalldirs) $(includedir) + @list="$(include_HEADERS)"; for p in $$list; do \ + echo "$(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \ + done + +uninstall-includeHEADERS: + list="$(include_HEADERS)"; for p in $$list; do \ + rm -f $(includedir)/$$p; \ + done + tags: TAGS ID: $(HEADERS) $(SOURCES) @@ -418,21 +419,21 @@ installcheck: install-exec: install-libPROGRAMS install-binSCRIPTS $(NORMAL_INSTALL) -install-data: install-modincludeDATA install-includeHEADERS install-modincludeHEADERS +install-data: install-modincludeDATA install-modincludeHEADERS install-includeHEADERS $(NORMAL_INSTALL) install: install-exec install-data all @: -uninstall: uninstall-libPROGRAMS uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS +uninstall: uninstall-libPROGRAMS uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-modincludeHEADERS uninstall-includeHEADERS all: $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) Makefile scmconfig.h install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install installdirs: - $(mkinstalldirs) $(libdir) $(bindir) $(modincludedir) $(includedir) \ - $(modincludedir) + $(mkinstalldirs) $(libdir) $(bindir) $(modincludedir) $(modincludedir) \ + $(includedir) mostlyclean-generic: @@ -477,10 +478,10 @@ install-libPROGRAMS mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \ install-binSCRIPTS uninstall-modincludeDATA install-modincludeDATA \ -uninstall-includeHEADERS install-includeHEADERS \ -uninstall-modincludeHEADERS install-modincludeHEADERS tags \ -mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir mostlyclean-depend distclean-depend clean-depend \ +uninstall-modincludeHEADERS install-modincludeHEADERS \ +uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \ +distclean-tags clean-tags maintainer-clean-tags distdir \ +mostlyclean-depend distclean-depend clean-depend \ maintainer-clean-depend info dvi installcheck install-exec install-data \ install uninstall all installdirs mostlyclean-generic distclean-generic \ clean-generic maintainer-clean-generic clean mostlyclean distclean \ diff --git a/libguile/aclocal.m4 b/libguile/aclocal.m4 index b98b16b89..26c90dc63 100644 --- a/libguile/aclocal.m4 +++ b/libguile/aclocal.m4 @@ -135,7 +135,31 @@ fi rm -f conftest* AC_MSG_RESULT(yes)]) -# serial 1 AM_PROG_LIBTOOL +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + AC_SUBST(MAINT)dnl +] +) + + +# serial 2 AM_PROG_LIBTOOL AC_DEFUN(AM_PROG_LIBTOOL, [AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_PROG_CC]) @@ -155,6 +179,11 @@ libtool_flags="$libtool_shared" test "$silent" = yes && libtool_flags="$libtool_flags --silent" test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" +# On SCO OpenServer 5, we need -belf to get full-featured binaries. +case "$host" in +*-*-sco3.2v5*) CFLAGS="$CFLAGS -belf" ;; +esac + # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" RANLIB="$RANLIB" \ $ac_aux_dir/ltconfig $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ diff --git a/libguile/configure b/libguile/configure index 525abbd08..37e420a9b 100755 --- a/libguile/configure +++ b/libguile/configure @@ -11,6 +11,9 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" ac_help="$ac_help --disable-debug Don't include debugging support" ac_help="$ac_help @@ -559,7 +562,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:563: checking for a BSD compatible install" >&5 +echo "configure:566: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -627,7 +630,7 @@ cat >> confdefs.h <&6 -echo "configure:631: checking whether build environment is sane" >&5 +echo "configure:634: checking whether build environment is sane" >&5 echo timestamp > conftestfile # Do this in a subshell so we don't clobber the current shell's # arguments. FIXME: maybe try `-L' hack like GETLOADAVG test? @@ -661,7 +664,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:665: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:668: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -708,6 +711,24 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. module=libguile +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:716: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + + #-------------------------------------------------------------------- # @@ -745,7 +766,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:749: checking for $ac_word" >&5 +echo "configure:770: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -774,7 +795,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:778: checking for $ac_word" >&5 +echo "configure:799: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -822,7 +843,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:826: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:847: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -832,11 +853,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -856,12 +877,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:881: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:865: checking whether we are using GNU C" >&5 +echo "configure:886: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -870,7 +891,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -885,7 +906,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:889: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:910: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -913,7 +934,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:917: checking how to run the C preprocessor" >&5 +echo "configure:938: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -928,13 +949,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -945,13 +966,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:955: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -980,7 +1001,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:984: checking host system type" >&5 +echo "configure:1005: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1003,7 +1024,7 @@ echo "$ac_t""$host" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1007: checking for $ac_word" >&5 +echo "configure:1028: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1050,6 +1071,11 @@ libtool_flags="$libtool_shared" test "$silent" = yes && libtool_flags="$libtool_flags --silent" test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" +# On SCO OpenServer 5, we need -belf to get full-featured binaries. +case "$host" in +*-*-sco3.2v5*) CFLAGS="$CFLAGS -belf" ;; +esac + # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" RANLIB="$RANLIB" \ $ac_aux_dir/ltconfig $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ @@ -1057,9 +1083,9 @@ $ac_aux_dir/ltconfig $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1061: checking for AIX" >&5 +echo "configure:1087: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1085: checking for POSIXized ISC" >&5 +echo "configure:1111: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1103,17 +1129,17 @@ fi ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1107: checking for minix/config.h" >&5 +echo "configure:1133: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1153,7 +1179,7 @@ fi echo $ac_n "checking "threads package type"""... $ac_c" 1>&6 -echo "configure:1157: checking "threads package type"" >&5 +echo "configure:1183: checking "threads package type"" >&5 if eval "test \"`echo '$''{'cy_cv_threads_package'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1212,7 +1238,7 @@ if test "$use_threads" != no; then LDFLAGS="-L$use_threads/lib" LIBS="-lgthreads -lmalloc" cat > conftest.$ac_ext < int main() { @@ -1221,7 +1247,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=FSU else @@ -1233,7 +1259,7 @@ rm -f conftest* if test "$threads_package" = unknown; then LIBS="-lpthread" cat > conftest.$ac_ext < int main() { @@ -1242,7 +1268,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:1246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=MIT else @@ -1254,7 +1280,7 @@ rm -f conftest* if test "$threads_package" = unknown; then LIBS="-lpthreads" cat > conftest.$ac_ext < int main() { @@ -1263,7 +1289,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:1267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=PCthreads else @@ -1295,12 +1321,12 @@ echo "$ac_t""$cy_cv_threads_package" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1299: checking for working const" >&5 +echo "configure:1325: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1371,12 +1397,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1375: checking for ANSI C header files" >&5 +echo "configure:1401: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1384,7 +1410,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1401,7 +1427,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1419,7 +1445,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1440,7 +1466,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1451,7 +1477,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1479,12 +1505,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1483: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1509: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1492,7 +1518,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1517,7 +1543,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1521: checking for opendir in -ldir" >&5 +echo "configure:1547: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1525,7 +1551,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1558,7 +1584,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1562: checking for opendir in -lx" >&5 +echo "configure:1588: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1566,7 +1592,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1600,12 +1626,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1604: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1630: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1614,7 +1640,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1635,12 +1661,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1639: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1665: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1656,7 +1682,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1680,17 +1706,17 @@ for ac_hdr in libc.h limits.h malloc.h memory.h string.h sys/ioctl.h sys/select. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1684: checking for $ac_hdr" >&5 +echo "configure:1710: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1721,17 +1747,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1725: checking for $ac_hdr" >&5 +echo "configure:1751: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1758,7 +1784,7 @@ fi done echo $ac_n "checking "whether libc.h and unistd.h can be included together"""... $ac_c" 1>&6 -echo "configure:1762: checking "whether libc.h and unistd.h can be included together"" >&5 +echo "configure:1788: checking "whether libc.h and unistd.h can be included together"" >&5 if eval "test \"`echo '$''{'guile_cv_header_libc_with_unistd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1769,7 +1795,7 @@ else guile_cv_header_libc_with_unistd="yes" else cat > conftest.$ac_ext < @@ -1779,7 +1805,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* guile_cv_header_libc_with_unistd=yes else @@ -1806,12 +1832,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1810: checking for uid_t in sys/types.h" >&5 +echo "configure:1836: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1840,7 +1866,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:1844: checking type of array argument to getgroups" >&5 +echo "configure:1870: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1848,7 +1874,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -1887,7 +1913,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -1911,12 +1937,12 @@ EOF echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1915: checking return type of signal handlers" >&5 +echo "configure:1941: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1933,7 +1959,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1952,12 +1978,12 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:1956: checking for mode_t" >&5 +echo "configure:1982: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1988,12 +2014,12 @@ fi for ac_func in ctermid ftime getcwd geteuid lstat mkdir mknod nice putenv readlink rename rmdir select setegid seteuid setlocale setpgid setsid strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1992: checking for $ac_func" >&5 +echo "configure:2018: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2044,12 +2070,12 @@ done for ac_func in inet_aton strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2048: checking for $ac_func" >&5 +echo "configure:2074: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2102,19 +2128,19 @@ done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2106: checking for working alloca.h" >&5 +echo "configure:2132: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2135,12 +2161,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2139: checking for alloca" >&5 +echo "configure:2165: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2195,12 +2221,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2199: checking whether alloca needs Cray hooks" >&5 +echo "configure:2225: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2229: checking for $ac_func" >&5 +echo "configure:2255: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2280,7 +2306,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2284: checking stack direction for C alloca" >&5 +echo "configure:2310: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2288,7 +2314,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2330,12 +2356,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2334: checking for st_rdev in struct stat" >&5 +echo "configure:2360: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2343,7 +2369,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2364,12 +2390,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2368: checking for st_blksize in struct stat" >&5 +echo "configure:2394: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2377,7 +2403,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2398,12 +2424,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2402: checking for st_blocks in struct stat" >&5 +echo "configure:2428: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2411,7 +2437,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2435,12 +2461,12 @@ fi echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6 -echo "configure:2439: checking whether we need POSIX to get struct utimbuf" >&5 +echo "configure:2465: checking whether we need POSIX to get struct utimbuf" >&5 if eval "test \"`echo '$''{'guile_cv_struct_utimbuf_needs_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2483,7 +2509,7 @@ xtra_PLUGIN_guile_libs="" if test "$enable_dynamic_linking" = "yes"; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2487: checking for dlopen in -ldl" >&5 +echo "configure:2513: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2491,7 +2517,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2537,7 +2563,7 @@ EOF else echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:2541: checking for dld_link in -ldld" >&5 +echo "configure:2567: checking for dld_link in -ldld" >&5 ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2545,7 +2571,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2593,12 +2619,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2597: checking for $ac_func" >&5 +echo "configure:2623: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2664,13 +2690,13 @@ if test "$cross_compiling" = yes; then echo "configure: warning: Guessing that stack grows down -- see scmconfig.h.in" 1>&2 else cat > conftest.$ac_ext <= ((unsigned long)&x)); } main () { int q; aux((unsigned long)&q); } EOF -if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define SCM_STACK_GROWS_UP 1 @@ -2693,11 +2719,11 @@ EOF echo "configure: warning: Guessing that sizeof(long) == sizeof(float) -- see scmconfig.h.in" 1>&2 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define SCM_SINGLES 1 @@ -2712,12 +2738,12 @@ fi echo $ac_n "checking for struct linger""... $ac_c" 1>&6 -echo "configure:2716: checking for struct linger" >&5 +echo "configure:2742: checking for struct linger" >&5 if eval "test \"`echo '$''{'scm_cv_struct_linger'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2726,7 +2752,7 @@ int main() { struct linger lgr; lgr.l_linger = 100 ; return 0; } EOF -if { (eval echo configure:2730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_linger="yes" else @@ -2756,7 +2782,7 @@ FD_SETTER="" if test "x$FD_SETTER" = x; then cat > conftest.$ac_ext < @@ -2764,7 +2790,7 @@ int main() { stdout->_file = 1 ; return 0; } EOF -if { (eval echo configure:2768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* FD_SETTER="((F)->_file = (D))" else @@ -2776,7 +2802,7 @@ fi if test "x$FD_SETTER" = x; then cat > conftest.$ac_ext < @@ -2784,7 +2810,7 @@ int main() { stdout->_fileno ; return 0; } EOF -if { (eval echo configure:2788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* FD_SETTER="((F)->_fileno = (D))" else @@ -2813,19 +2839,19 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to get buffer char count from FILE structure""... $ac_c" 1>&6 -echo "configure:2817: checking how to get buffer char count from FILE structure" >&5 +echo "configure:2843: checking how to get buffer char count from FILE structure" >&5 if eval "test \"`echo '$''{'scm_cv_struct_file_count'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->_cnt = 0 ; return 0; } EOF -if { (eval echo configure:2829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_cnt" else @@ -2833,14 +2859,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->_r = 0 ; return 0; } EOF -if { (eval echo configure:2844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_r" else @@ -2848,14 +2874,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->readCount = 0 ; return 0; } EOF -if { (eval echo configure:2859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="readCount" else @@ -2882,14 +2908,14 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_gptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->_gptr = f->egptr; ; return 0; } EOF -if { (eval echo configure:2893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_gptr=1 else @@ -2912,14 +2938,14 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_readptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->_IO_read_ptr = f->_IO_read_end; ; return 0; } EOF -if { (eval echo configure:2923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_readptr=1 else @@ -2990,7 +3016,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2994: checking for $ac_word" >&5 +echo "configure:3020: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3019,7 +3045,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether errno codes can be extracted from errno.h""... $ac_c" 1>&6 -echo "configure:3023: checking whether errno codes can be extracted from errno.h" >&5 +echo "configure:3049: checking whether errno codes can be extracted from errno.h" >&5 if test "$GCC" = yes ; then echo "$ac_t""yes" 1>&6 ERRNO_EXTRACT="${CC-cc} -undef -dM -E $srcdir/errnos_get.c | egrep ' E.+' | cut -f2 -d' ' > errnos.list" @@ -3188,6 +3214,7 @@ s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g s%@SET_MAKE@%$SET_MAKE%g s%@module@%$module%g +s%@MAINT@%$MAINT%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@host@%$host%g diff --git a/libguile/configure.in b/libguile/configure.in index c30b14375..524df7758 100644 --- a/libguile/configure.in +++ b/libguile/configure.in @@ -1,6 +1,7 @@ AC_INIT(eval.c) AM_CONFIG_HEADER(scmconfig.h) AM_INIT_GUILE_MODULE(libguile) +AM_MAINTAINER_MODE #-------------------------------------------------------------------- # diff --git a/qt/ChangeLog b/qt/ChangeLog index 70a11a46f..0ef86f386 100644 --- a/qt/ChangeLog +++ b/qt/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 24 21:47:16 1997 Mikael Djurfeldt + + * configure.in: Added AM_MAINTAINER_MODE + Sun Feb 9 15:20:59 1997 Mikael Djurfeldt * configure.in: Added changequote(,) before the host case (since diff --git a/qt/Makefile.in b/qt/Makefile.in index 634b72a0e..0a0948df7 100644 --- a/qt/Makefile.in +++ b/qt/Makefile.in @@ -37,21 +37,22 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -host_triplet = @host@ host_alias = @host_alias@ -target_libs = @target_libs@ -VERSION = @VERSION@ +host_triplet = @host@ +RANLIB = @RANLIB@ module = @module@ +qtmd_h = @qtmd_h@ CC = @CC@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ qtmds_o = @qtmds_o@ qtmdc_o = @qtmdc_o@ -RANLIB = @RANLIB@ -qtmdb_s = @qtmdb_s@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -qtmdc_c = @qtmdc_c@ +target_libs = @target_libs@ qtmds_s = @qtmds_s@ -PACKAGE = @PACKAGE@ -qtmd_h = @qtmd_h@ +qtmdc_c = @qtmdc_c@ +qtmdb_s = @qtmdb_s@ +MAINT = @MAINT@ AUTOMAKE_OPTIONS = foreign @@ -97,19 +98,19 @@ default: all .SUFFIXES: .SUFFIXES: .c .o -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --foreign Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -$(srcdir)/aclocal.m4: configure.in +$(srcdir)/aclocal.m4: @MAINT@configure.in cd $(srcdir) && aclocal config.status: configure $(SHELL) ./config.status --recheck -$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) +$(srcdir)/configure: @MAINT@configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && autoconf qt.h: $(top_builddir)/config.status qt.h.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status diff --git a/qt/aclocal.m4 b/qt/aclocal.m4 index a41f837ad..e677fbcfd 100644 --- a/qt/aclocal.m4 +++ b/qt/aclocal.m4 @@ -62,6 +62,29 @@ fi rm -f conftest* AC_MSG_RESULT(yes)]) +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering + +# serial 1 + +AC_DEFUN(AM_MAINTAINER_MODE, +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + AC_SUBST(MAINT)dnl +] +) + dnl dnl CY_AC_WITH_THREADS determines which thread library the user intends dnl to put underneath guile. Pass it the path to find the guile top-level diff --git a/qt/configure b/qt/configure index 79e9da4a0..0d65e43f4 100755 --- a/qt/configure +++ b/qt/configure @@ -11,6 +11,9 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer" ac_help="$ac_help --with-threads thread interface" @@ -550,7 +553,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:554: checking for a BSD compatible install" >&5 +echo "configure:557: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -618,7 +621,7 @@ cat >> confdefs.h <&6 -echo "configure:622: checking whether build environment is sane" >&5 +echo "configure:625: checking whether build environment is sane" >&5 echo timestamp > conftestfile # Do this in a subshell so we don't clobber the current shell's # arguments. FIXME: maybe try `-L' hack like GETLOADAVG test? @@ -652,7 +655,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:656: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:659: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -699,11 +702,29 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. module=qt +echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 +echo "configure:707: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + USE_MAINTAINER_MODE=$enableval +else + USE_MAINTAINER_MODE=no +fi + + echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 + if test $USE_MAINTAINER_MODE = yes; then + MAINT= + else + MAINT='#M#' + fi + + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:707: checking for $ac_word" >&5 +echo "configure:728: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -732,7 +753,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:736: checking for $ac_word" >&5 +echo "configure:757: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -780,7 +801,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:805: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -790,11 +811,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -814,12 +835,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:818: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:839: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:823: checking whether we are using GNU C" >&5 +echo "configure:844: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -828,7 +849,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -843,7 +864,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:868: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -871,7 +892,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:875: checking how to run the C preprocessor" >&5 +echo "configure:896: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -886,13 +907,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -903,13 +924,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -934,7 +955,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:938: checking for $ac_word" >&5 +echo "configure:959: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -963,7 +984,7 @@ fi echo $ac_n "checking "threads package type"""... $ac_c" 1>&6 -echo "configure:967: checking "threads package type"" >&5 +echo "configure:988: checking "threads package type"" >&5 if eval "test \"`echo '$''{'cy_cv_threads_package'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1022,7 +1043,7 @@ if test "$use_threads" != no; then LDFLAGS="-L$use_threads/lib" LIBS="-lgthreads -lmalloc" cat > conftest.$ac_ext < int main() { @@ -1031,7 +1052,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=FSU else @@ -1043,7 +1064,7 @@ rm -f conftest* if test "$threads_package" = unknown; then LIBS="-lpthread" cat > conftest.$ac_ext < int main() { @@ -1052,7 +1073,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=MIT else @@ -1064,7 +1085,7 @@ rm -f conftest* if test "$threads_package" = unknown; then LIBS="-lpthreads" cat > conftest.$ac_ext < int main() { @@ -1073,7 +1094,7 @@ pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* threads_package=PCthreads else @@ -1117,7 +1138,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1121: checking host system type" >&5 +echo "configure:1142: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1345,6 +1366,7 @@ s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g s%@SET_MAKE@%$SET_MAKE%g s%@module@%$module%g +s%@MAINT@%$MAINT%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@RANLIB@%$RANLIB%g diff --git a/qt/configure.in b/qt/configure.in dissimilarity index 100% index 7c3627820..e69de29bb 100644 --- a/qt/configure.in +++ b/qt/configure.in @@ -1,77 +0,0 @@ -AC_INIT(qt.c) -AM_INIT_GUILE_MODULE(qt) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_CPP -AC_PROG_RANLIB - -CY_AC_WITH_THREADS - -threads_enabled=false -if test "$cy_cv_threads_package" = COOP; then - threads_enabled=true -fi - -# Determine the host we are working on -AC_CANONICAL_HOST - -changequote(,)dnl We use [ and ] in a regexp in the case -case "$host" in -i[3456]86-*-*) - qtmds_s=$srcdir/md/i386.s - qtmd_h=$srcdir/md/i386.h - qtmdc_c=$srcdir/md/null.c - ;; -mips-sgi-irix5*) - qtmds_s=$srcdir/md/mips-irix5.s - qtmd_h=$srcdir/md/mips.h - qtmdc_c=$srcdir/md/null.c - qtdmdb_s=$srcdir/md/mips_b.s - ;; -mips-*-*) - qtmds_s=$srcdir/md/mips.s - qtmd_h=$srcdir/md/mips.h - qtmdc_c=$srcdir/md/null.c - qtdmdb_s=$srcdir/md/mips_b.s - ;; -sparc-sun-solaris2.*) - qtmd_h=$srcdir/md/sparc.h - qtmdc_c=$srcdir/md/null.c - qtmds_s=$srcdir/md/sparc.s - qtdmdb_s=$srcdir/md/sparc_b.s - ;; -sparc-*-*) - qtmd_h=$srcdir/md/sparc.h - qtmdc_c=$srcdir/md/null.c - qtmds_s=$srcdir/md/_sparc.s - qtdmdb_s=$srcdir/md/_sparc_b.s - ;; -*) - echo "Unknown configuration; threads package disabled" - threads_enabled=false - ;; -esac -changequote([, ]) - - -if $threads_enabled; then - target_libs=libqt.a -else - target_libs= -fi - -# Give the Makefile the names of the object files that will be -# generated by compiling $qtmdc_c and $qtmds_s. -qtmdc_o="`echo ${qtmdc_c} | sed -e 's:^.*/::' | sed -e 's:\.c$:\.o:'`" -qtmds_o="`echo ${qtmds_s} | sed -e 's:^.*/::' | sed -e 's:\.s$:\.o:'`" - -AC_SUBST(target_libs) -AC_SUBST(qtmd_h) -AC_SUBST(qtmdc_c) -AC_SUBST(qtmdc_o) -AC_SUBST(qtmds_s) -AC_SUBST(qtmds_o) -AC_SUBST(qtmdb_s) - -AC_OUTPUT(Makefile qt.h md/Makefile time/Makefile) diff --git a/qt/md/Makefile.in b/qt/md/Makefile.in index 7e3696610..ad3605a7b 100644 --- a/qt/md/Makefile.in +++ b/qt/md/Makefile.in @@ -37,21 +37,22 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -host_triplet = @host@ host_alias = @host_alias@ -target_libs = @target_libs@ -VERSION = @VERSION@ +host_triplet = @host@ +RANLIB = @RANLIB@ module = @module@ +qtmd_h = @qtmd_h@ CC = @CC@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ qtmds_o = @qtmds_o@ qtmdc_o = @qtmdc_o@ -RANLIB = @RANLIB@ -qtmdb_s = @qtmdb_s@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -qtmdc_c = @qtmdc_c@ +target_libs = @target_libs@ qtmds_s = @qtmds_s@ -PACKAGE = @PACKAGE@ -qtmd_h = @qtmd_h@ +qtmdc_c = @qtmdc_c@ +qtmdb_s = @qtmdb_s@ +MAINT = @MAINT@ AUTOMAKE_OPTIONS = foreign @@ -74,7 +75,7 @@ TAR = tar default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --foreign md/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) diff --git a/qt/time/Makefile.in b/qt/time/Makefile.in index 74e3865cf..005e45f5d 100644 --- a/qt/time/Makefile.in +++ b/qt/time/Makefile.in @@ -37,21 +37,22 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -host_triplet = @host@ host_alias = @host_alias@ -target_libs = @target_libs@ -VERSION = @VERSION@ +host_triplet = @host@ +RANLIB = @RANLIB@ module = @module@ +qtmd_h = @qtmd_h@ CC = @CC@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ qtmds_o = @qtmds_o@ qtmdc_o = @qtmdc_o@ -RANLIB = @RANLIB@ -qtmdb_s = @qtmdb_s@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -qtmdc_c = @qtmdc_c@ +target_libs = @target_libs@ qtmds_s = @qtmds_s@ -PACKAGE = @PACKAGE@ -qtmd_h = @qtmd_h@ +qtmdc_c = @qtmdc_c@ +qtmdb_s = @qtmdb_s@ +MAINT = @MAINT@ AUTOMAKE_OPTIONS = foreign @@ -68,7 +69,7 @@ TAR = tar default: all .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) +$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) cd $(top_srcdir) && automake --foreign time/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) -- 2.20.1