From c1c6aa4b204879d22281a382b4330d6fb4e18b9c Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Sun, 29 Aug 1999 18:04:43 +0000 Subject: [PATCH] Regenerated --- Makefile.in | 48 +++++++++++++++++---- configure | 85 +++++++++++++++++++++++++++----------- guile-readline/Makefile.in | 32 +++++++++++--- libguile/Makefile.in | 4 +- libguile/scmconfig.h.in | 9 ++++ 5 files changed, 138 insertions(+), 40 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0b091cb66..2441adfe2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -105,9 +105,10 @@ CONFIG_CLEAN_FILES = DATA = $(aclocal_DATA) DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 config.guess \ -config.sub configure configure.in install-sh ltconfig ltmain.sh \ -mdate-sh missing mkinstalldirs +Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 aclocal.m4 \ +config.guess config.sub configure configure.in install-sh \ +libguile/scmconfig.h.in libguile/stamp-h.in ltconfig ltmain.sh mdate-sh \ +missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -131,6 +132,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) +libguile/scmconfig.h: libguile/stamp-h + @if test ! -f $@; then \ + rm -f libguile/stamp-h; \ + $(MAKE) libguile/stamp-h; \ + else :; fi +libguile/stamp-h: $(srcdir)/libguile/scmconfig.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=libguile/scmconfig.h \ + $(SHELL) ./config.status + @echo timestamp > libguile/stamp-h 2> /dev/null +$(srcdir)/libguile/scmconfig.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/libguile/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/libguile/stamp-h.in; \ + $(MAKE) $(srcdir)/libguile/stamp-h.in; \ + else :; fi +$(srcdir)/libguile/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/libguile/stamp-h.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f libguile/scmconfig.h + +maintainer-clean-hdr: + install-aclocalDATA: $(aclocal_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(aclocaldir) @@ -339,29 +368,30 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-tags clean-generic mostlyclean-am +clean-am: clean-hdr clean-tags clean-generic mostlyclean-am clean: clean-recursive -distclean-am: distclean-tags distclean-generic clean-am +distclean-am: distclean-hdr distclean-tags distclean-generic clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: uninstall-aclocalDATA install-aclocalDATA install-data-recursive \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +uninstall-aclocalDATA install-aclocalDATA install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ diff --git a/configure b/configure index 27c44bc0b..059f8d1ce 100755 --- a/configure +++ b/configure @@ -3247,7 +3247,7 @@ fi fi -for ac_func in ctermid ftime getcwd geteuid gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid bzero strdup system usleep +for ac_func in ctermid ftime getcwd geteuid gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid bzero strdup system usleep memmove bcopy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:3254: checking for $ac_func" >&5 @@ -4219,13 +4219,50 @@ EOF fi +echo $ac_n "checking for S_ISLNK in sys/stat.h""... $ac_c" 1>&6 +echo "configure:4224: checking for S_ISLNK in sys/stat.h" >&5 +if eval "test \"`echo '$''{'ac_cv_macro_S_ISLNK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < + #ifndef S_ISLNK + #error no S_ISLNK + #endif +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:4237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_macro_S_ISLNK=yes +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_macro_S_ISLNK=no +fi +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_macro_S_ISLNK" 1>&6 +if test $ac_cv_macro_S_ISLNK = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_S_ISLNK 1 +EOF + +fi + echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4224: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4261: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4233,7 +4270,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4254,12 +4291,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4258: checking for tm_zone in struct tm" >&5 +echo "configure:4295: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -4267,7 +4304,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4287,12 +4324,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4291: checking for tzname" >&5 +echo "configure:4328: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -4302,7 +4339,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4325,12 +4362,12 @@ fi echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6 -echo "configure:4329: checking whether we need POSIX to get struct utimbuf" >&5 +echo "configure:4366: 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:4383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4375,13 +4412,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:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define SCM_STACK_GROWS_UP 1 @@ -4396,7 +4433,7 @@ fi echo $ac_n "checking whether floats fit in longs""... $ac_c" 1>&6 -echo "configure:4400: checking whether floats fit in longs" >&5 +echo "configure:4437: checking whether floats fit in longs" >&5 if eval "test \"`echo '$''{'guile_cv_type_float_fits_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4404,11 +4441,11 @@ else guile_cv_type_float_fits_long=guess-yes else cat > conftest.$ac_ext < sizeof(long)); } EOF -if { (eval echo configure:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then guile_cv_type_float_fits_long=yes else @@ -4442,12 +4479,12 @@ esac echo $ac_n "checking for struct linger""... $ac_c" 1>&6 -echo "configure:4446: checking for struct linger" >&5 +echo "configure:4483: 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 < @@ -4456,7 +4493,7 @@ int main() { struct linger lgr; lgr.l_linger = 100 ; return 0; } EOF -if { (eval echo configure:4460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_linger="yes" else @@ -4516,7 +4553,7 @@ fi ### Turn $with_threads into either the name of a threads package, like ### `qt', or `no', meaning that threads should not be supported. echo $ac_n "checking whether to support threads""... $ac_c" 1>&6 -echo "configure:4520: checking whether to support threads" >&5 +echo "configure:4557: checking whether to support threads" >&5 case "$with_threads" in "yes" | "qt" | "coop" | "") with_threads=qt @@ -4540,7 +4577,7 @@ case "${with_threads}" in echo $ac_n "checking QuickThreads configuration""... $ac_c" 1>&6 -echo "configure:4544: checking QuickThreads configuration" >&5 +echo "configure:4581: checking QuickThreads configuration" >&5 # How can we refer to the qt source directory from within the qt build # directory? For headers, we can rely on the fact that the qt src # directory appears in the #include path. @@ -4685,7 +4722,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:4689: checking for $ac_word" >&5 +echo "configure:4726: 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 diff --git a/guile-readline/Makefile.in b/guile-readline/Makefile.in index 9dea3143a..39b159d3b 100644 --- a/guile-readline/Makefile.in +++ b/guile-readline/Makefile.in @@ -81,6 +81,8 @@ libguilereadline_la_SOURCES = readline.h readline.c BUILT_SOURCES = readline.x +pkginclude_HEADERS = readline.h + scmdir = $(datadir)/guile scm_DATA = readline-activator.scm @@ -107,6 +109,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(scm_DATA) +HEADERS = $(pkginclude_HEADERS) + DIST_COMMON = ChangeLog Makefile.am Makefile.in aclocal.m4 configure \ configure.in @@ -216,6 +220,21 @@ uninstall-scmDATA: rm -f $(DESTDIR)$(scmdir)/$$p; \ done +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) + @list='$(pkginclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ + done + +uninstall-pkgincludeHEADERS: + @$(NORMAL_UNINSTALL) + list='$(pkginclude_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(pkgincludedir)/$$p; \ + done + tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -341,20 +360,22 @@ installcheck: installcheck-am install-exec-am: install-libLTLIBRARIES install-exec: install-exec-am -install-data-am: install-scmDATA +install-data-am: install-scmDATA install-pkgincludeHEADERS install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-libLTLIBRARIES uninstall-scmDATA +uninstall-am: uninstall-libLTLIBRARIES uninstall-scmDATA \ + uninstall-pkgincludeHEADERS uninstall: uninstall-am -all-am: Makefile $(LTLIBRARIES) $(DATA) +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(scmdir) + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(scmdir) \ + $(DESTDIR)$(pkgincludedir) mostlyclean-generic: @@ -401,7 +422,8 @@ clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ -maintainer-clean-libtool uninstall-scmDATA install-scmDATA tags \ +maintainer-clean-libtool uninstall-scmDATA install-scmDATA \ +uninstall-pkgincludeHEADERS install-pkgincludeHEADERS tags \ mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ distdir mostlyclean-depend distclean-depend clean-depend \ maintainer-clean-depend info-am info dvi-am dvi check check-am \ diff --git a/libguile/Makefile.in b/libguile/Makefile.in index 730f97266..be19c69e2 100644 --- a/libguile/Makefile.in +++ b/libguile/Makefile.in @@ -106,7 +106,7 @@ guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c srcprop.c stackchk.c stacks.c stime.c strings.c strop.c strorder.c strports.c struct.c symbols.c tag.c throw.c unif.c variable.c vectors.c version.c vports.c weaks.c -BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h alist.x arbiters.x async.x backtrace.x boolean.x chars.x continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x evalext.x feature.x filesys.x fluids.x fports.x gc.x gdbint.x gh_data.x gh_eval.x gh_funcs.x gh_init.x gh_io.x gh_list.x gh_predicates.x gsubr.x guardians.x hash.x hashtab.x init.x ioext.x iselect.x keywords.x lang.x list.x load.x macros.x mallocs.x modules.x net_db.x numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x print.x procprop.x procs.x random.x ramap.x read.x regex-posix.x root.x scmsigs.x script.x simpos.x smob.x socket.x sort.x srcprop.x stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x struct.x symbols.x tag.x threads.x throw.x unif.x variable.x vectors.x version.x vports.x weaks.x +BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h alist.x arbiters.x async.x backtrace.x boolean.x chars.x continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x evalext.x feature.x filesys.x fluids.x fports.x gc.x gsubr.x guardians.x hash.x hashtab.x init.x ioext.x iselect.x keywords.x lang.x list.x load.x macros.x mallocs.x modules.x net_db.x numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x print.x procprop.x procs.x random.x ramap.x read.x regex-posix.x root.x scmsigs.x script.x simpos.x smob.x socket.x sort.x srcprop.x stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x struct.x symbols.x tag.x threads.x throw.x unif.x variable.x vectors.x version.x vports.x weaks.x EXTRA_libguile_la_SOURCES = _scm.h strerror.c inet_aton.c putenv.c threads.c alloca.c regex-posix.c iselect.c @@ -116,7 +116,7 @@ noinst_HEADERS = coop-threads.c coop-threads.h coop.c libguile_la_DEPENDENCIES = @LIBLOBJS@ libguile_la_LIBADD = @LIBLOBJS@ -libguile_la_LDFLAGS = -version-info 5:0 -export-dynamic +libguile_la_LDFLAGS = -version-info 6:0 -export-dynamic include_HEADERS = libguile.h diff --git a/libguile/scmconfig.h.in b/libguile/scmconfig.h.in index dde611a02..a40149042 100644 --- a/libguile/scmconfig.h.in +++ b/libguile/scmconfig.h.in @@ -94,6 +94,9 @@ #undef DEBUG_EXTENSIONS #undef READER_EXTENSIONS +/* Define this if your system defines S_ISLNK in sys/stat.h */ +#undef HAVE_S_ISLNK + /* Define this if your system defines struct linger, for use with the getsockopt and setsockopt system calls. */ #undef HAVE_STRUCT_LINGER @@ -170,6 +173,9 @@ /* The number of bytes in a long. */ #undef SIZEOF_LONG +/* Define if you have the bcopy function. */ +#undef HAVE_BCOPY + /* Define if you have the bzero function. */ #undef HAVE_BZERO @@ -245,6 +251,9 @@ /* Define if you have the lstat function. */ #undef HAVE_LSTAT +/* Define if you have the memmove function. */ +#undef HAVE_MEMMOVE + /* Define if you have the mkdir function. */ #undef HAVE_MKDIR -- 2.20.1