summaryrefslogtreecommitdiff
path: root/meta
AgeCommit message (Collapse)AuthorFilesLines
2011-11-22Leave $GUILE_LOAD_COMPILED_PATH unchanged when cross-compiling.Ludovic Courtès1-14/+19
* meta/uninstalled-env.in: Don't define $GUILE_LOAD_COMPILED_PATH when cross-compiling.
2011-07-25Merge remote-tracking branch 'origin/stable-2.0'Andy Wingo2-34/+26
Conflicts: GUILE-VERSION test-suite/tests/srfi-4.test
2011-07-23guild: Close over `$bindir/guile'.Ludovic Courtès2-1/+7
* configure.ac: Substitute `guile_program_name'. * meta/guild.in: Use `@bindir@/@guile_program_name@' by default. * meta/uninstalled-env.in: Define $GUILE.
2011-07-23Change `guild --help' and `--version' output to be more GNUish.Ludovic Courtès1-2/+2
* meta/guild.in (display-version): Display the version, not the effective version. * module/scripts/help.scm (list-commands)[help]: Add proper footer, as per the GCS.
2011-07-23add (scripts help)Andy Wingo1-33/+19
* meta/guild.in (display-version): Use (ice-9 command-line)'s version-etc. (main): Dispatch --help to guild help. * module/scripts/help.scm: New file, a copy of list.scm, but with a better name. * module/Makefile.am: Add help.scm to the list. * module/scripts/list.scm: Change to be an alias to "help". (list-scripts): Restore this API.
2011-06-02Merge remote-tracking branch 'local-2.0/stable-2.0'Andy Wingo2-11/+16
Conflicts: meta/Makefile.am
2011-05-31rename `guile-tools' to `guild'Andy Wingo2-12/+17
* configure.ac: Look for ln -s. Write out `guild' instead of `guile-tools'. * meta/Makefile.am (install-data-hook): Link the installed `guild' to the backward-compatible `guile-tools' name. (bin_SCRIPTS, EXTRA_DIST): Fix up for guild change. * meta/guild.in: Moved here from `guile-tools.in'. * doc/ref/Makefile.am (autoconf-macros.texi): * doc/ref/api-evaluation.texi (Compilation): * doc/ref/autoconf.texi (Autofrisk, Using Autofrisk): * doc/ref/mod-getopt-long.texi (getopt-long Reference): * doc/ref/tools.texi (Miscellaneous Tools, Executable Modules): Minimal doc update. * .gitignore: * am/guilec (.scm.go): * libguile/Makefile.am (snarf2checkedtexi): * module/Makefile.am (ice-9/psyntax-pp.go): Update makefiles, etc. * module/scripts/README: * module/scripts/lint.scm: * module/scripts/list.scm: Update commentaries.
2011-05-30Merge remote-tracking branch 'origin/stable-2.0'Andy Wingo1-137/+25
2011-05-26Reveal guile-tools's inner simplicity...Neil Jerram1-137/+25
...by not using its own-rolled getopt, and moving the `list' function to a separate script * meta/guile-tools.in: Use (ice-9 getopt-long). (directory-files, strip-extensions, unique, find-submodules, list-scripts): Deleted (and moved to new `list.scm' file). (getopt): Deleted. (main): Use getopt-long. Default to calling the `list' script if no script is specified. * module/scripts/list.scm: New script. * module/Makefile.am (SCRIPTS_SOURCES): Add list.scm.
2011-05-05Merge remote-tracking branch 'origin/stable-2.0'Andy Wingo2-2/+2
2011-05-04build support for detecting clock_gettime, with -lrt if neededAndy Wingo2-2/+2
* acinclude.m4 (gl_CLOCK_TIME): * configure.ac: Locally include gl_CLOCK_TIME. To be fixed properly when gnulib updates their license to reflect the actual BSD state of things. * libguile/Makefile.am (libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS): Add -lrt for clock_gettime, if needed. * meta/guile-2.0-uninstalled.pc.in: * meta/guile-2.0.pc.in: Likewise, in Libs.private.
2011-04-28Merge remote-tracking branch 'origin/stable-2.0'Andy Wingo1-1/+3
Conflicts: GUILE-VERSION
2011-04-15Allow compilation with `--disable-posix'.Ludovic Courtès1-1/+3
Reported by Dmitry Dzhus <dima@dzhus.org>. * configure.ac: Remove `AC_LIBOBJ([filesys])'. Document `--disable-posix' as omitting non-essential POSIX interfaces. * libguile/Makefile.am (libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): Add `filesys.c'. (DOT_DOC_FILES): Add `filesys.doc'. (EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): Remove `filesys.c'. * libguile/posix.c (scm_mkstemp, scm_access): Move to `filesys.c'. (scm_init_posix): Move `R_OK' etc. to `filesys.c'. * libguile/filesys.c (scm_chown, scm_chmod, scm_umask, scm_open_fdes, scm_open, scm_close, scm_close_fdes, scm_link, scm_tc16_dir, scm_directory_stream_p, scm_opendir, scm_readdir, scm_rewinddir, scm_closedir, scm_dir_print, scm_dir_free, scm_chdir, scm_getcwd, set_element, fill_select_type, get_element, retrieve_select_type, scm_select, scm_fcntl, scm_fsync, scm_symlink, scm_readlink, scm_lstat, scm_copy_file): Conditionalize on HAVE_POSIX. (scm_mkstemp, scm_access): New functions. (scm_init_filesys): Conditionalize `scm_tc16_dir', `O_RDONLY', etc. on HAVE_POSIX. Define `R_OK', `W_OK', etc. * libguile/fports.c (fport_print): Use `scm_ttyname' only when HAVE_POSIX. * libguile/i18n.c (lock_locale_mutex, unlock_locale_mutex): New functions. Update users of `scm_i_locale_mutex' to use them. * libguile/init.c (scm_i_init_guile): Always call `scm_init_filesys'. * meta/guile-tools.in (main): Use `setlocale' only when it is defined. * module/ice-9/boot-9.scm: Always load `ice-9/posix'.
2011-04-11bump effective version to 2.2Andy Wingo4-5/+5
* .gitignore: * GUILE-VERSION (GUILE_EFFECTIVE_VERSION): * configure.ac: * doc/example-smob/Makefile (CFLAGS, LIBS): * doc/guile.1: * doc/ref/libguile-concepts.texi: * doc/ref/srfi-modules.texi: * doc/ref/vm.texi: * meta/Makefile.am (EXTRA_DIST, pkgconfig_DATA): * meta/guile-config.in (guile-module): * meta/guile-2.2-uninstalled.pc.in: * meta/guile-2.2.pc.in: Bump effective version to 2.2.
2011-03-31fix duplicate path in uninstalled-envAndy Wingo1-0/+3
* meta/uninstalled-env.in: Our code that checked for paths already being in the load path was not working for the last entry in the load path. This caused the last entry to be re-added to the beginning, which also caused relative filename canonicalization to prepend "module/" to everything. Terrible.
2011-02-20guile.m4: Add support for linking against guile with rpath.Bruno Haible1-8/+35
* guile.m4 (GUILE_FLAGS): Also set GUILE_LIBS and GUILE_LTLIBS. Fix documentation.
2011-02-08uninstalled-env ordering tweaks to fix readline's file nameAndy Wingo1-7/+7
* meta/uninstalled-env.in (subdirs_with_ltlibs): Remove "srfi". Reorder the load-path and load-compiled-path to put the root dir after guile-readline, so that relative canonicalization computes the correct path for ice-9/readline.scm.
2011-01-29When cross building, run GUILE_FOR_BUILD instead of just-built guile.Jan Nieuwenhuizen1-1/+5
* meta/guile.in: Run @GUILE_FOR_BUILD@ when cross-compiling. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2011-01-29Add `-lgc' to `Libs' in `guile-2.0.pc'.Ludovic Courtès2-4/+4
This accounts for the fact that some public Guile macros and inline functions use libgc functions. * meta/guile-2.0.pc.in (Libs.private): Move @BDW_GC_LIBS@ to... (Libs): ... here. Reported by Hans Aberg <haberg-1@telia.com>. * meta/guile-2.0-uninstalled.pc.in: Likewise.
2011-01-27fix guile-tools getoptAndy Wingo1-32/+85
* meta/guile-tools.in (getopt): Define a local version of getopt that stops parsing options when it sees a non-option.
2011-01-27guile-tools gracefully errors for missing scriptsAndy Wingo1-5/+9
* meta/guile-tools.in (find-script): Use the #:ensure arg of resolve-module. (main): Display a comprehensible error message if we don't find a script.
2011-01-27guile-tools uses getopt-longAndy Wingo1-20/+33
* meta/guile-tools.in: Use getopt-long.
2011-01-27guile-tools uses srfi-1Andy Wingo1-14/+3
* meta/guile-tools.in (guile-tools): Use srfi-1 here, now that we can.
2010-10-20Add `Libs.private' to the `.pc' files.Ludovic Courtès2-2/+4
* meta/guile-2.0-uninstalled.pc.in (Libs): Remove @GUILE_LIBS@. (Libs.private): New field. * meta/guile-2.0.pc.in (Libs): Remove @GUILE_LIBS@. (Libs.private): New field.
2010-10-03Add v1.8.x backward compatiblity to GUILE_SITE_DIRMichael Gran1-2/+5
* meta/guile.m4 (GUILE_SITE_DIR): use pkgdatadir if no sitedir
2010-09-04fix guile-tools --help and --versionAndy Wingo1-6/+28
* meta/guile-tools.in: Fix --help and --version.
2010-08-06s/extensionsdir/extensiondir/Andy Wingo1-1/+1
* libguile/Makefile.am (libpath.h): Change "extensionsdir" to "extensiondir". * meta/guile-2.0.pc.in (extensiondir): Likewise.
2010-06-10brown-paper-bag to uninstalled-envAndy Wingo1-1/+1
* meta/uninstalled-env.in: Fix lack of test.
2010-06-10more uninstalled-env fixenAndy Wingo1-7/+13
* meta/uninstalled-env.in: Don't implicitly add . to LTDL search paths if no LTDL_LIBRARY_PATH was set. Avoid a duplicate to PATH.
2010-06-10uninstalled-env cleanupsAndy Wingo1-12/+14
* meta/uninstalled-env.in: Clean up setting of GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH.
2010-06-10don't forget to set GUILE_SYSTEM_PATH in uninstalled modeAndy Wingo1-1/+5
* meta/uninstalled-env.in (GUILE_SYSTEM_PATH): Set this var too in uninstalled mode.
2010-03-16parallel installability for libguile*.hAndy Wingo1-1/+2
* Makefile.am: * libguile/Makefile.am (modincludedir): Install into $pkgincludedir/$GUILE_EFFECTIVE_VERSION. This allows multiple Guile development packages to be installed at once. * guile-readline/Makefile.am (modincludedir): * srfi/Makefile.am (srfiincludedir): Likewise. * meta/guile-2.0.pc.in (Cflags): Add the appropriate -I line so that user code picks up the new location transparently.
2010-03-16rename libguile to libguile-@EFFECTIVE_VERSION@, currently libguile-2.0Andy Wingo2-2/+2
* libguile/Makefile.am (lib_LTLIBRARIES): Instead of just "libguile.la", make "libguile-@EFFECTIVE_VERSION@.la". This allows multiple versions of Guile to be installed at once. See http://www106.pair.com/rhp/parallel.html for a rationale. (libguile_@GUILE_EFFECTIVE_VERSION@_la_CFLAGS): (libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): (EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES): (libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES): (libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD): (libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS): Fixup automake vars to include the effective version. (guile_LDADD): Fix up the spelling of libguile. * libguile/bytevectors.c (scm_bootstrap_bytevectors): * libguile/foreign.c (scm_register_foreign): * libguile/i18n.c (scm_bootstrap_i18n): * libguile/instructions.c (scm_bootstrap_instructions): * libguile/objcodes.c (scm_bootstrap_objcodes): * libguile/programs.c (scm_bootstrap_programs): * libguile/vm.c (scm_bootstrap_vm): Register extensions using e.g. "libguile-2.0" as the libname -- i.e., including the effective version in the libname. * module/ice-9/i18n.scm: * module/rnrs/bytevector.scm: * module/rnrs/io/ports.scm: * module/system/foreign.scm: * module/system/vm/instruction.scm: * module/system/vm/objcode.scm: * module/system/vm/program.scm: * module/system/vm/vm.scm: When doing a load-extension for something in Guile, use the effective version also. * meta/guile-2.0-uninstalled.pc.in (Libs): * meta/guile-2.0.pc.in (Libs): Use -lguile-@EFFECTIVE_VERSION@. This change should mean that code built against Guile should not be affected by the libguile rename. * guile-readline/Makefile.am (libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD): * srfi/Makefile.am (libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD): (libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD): (libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD): (libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD): * test-suite/standalone/Makefile.am (test_num2integral_LDADD): (test_round_LDADD): (libtest_asmobs_la_LIBADD): (libtest_ffi_la_LIBADD): (test_list_LDADD): (test_unwind_LDADD): (test_conversion_LDADD): (test_loose_ends_LDADD): (test_scm_c_read_LDADD): (test_scm_take_locale_symbol_LDADD): (test_scm_take_u8vector_LDADD): (libtest_extensions_la_LIBADD): (test_with_guile_module_LDADD): (test_scm_with_guile_LDADD): Fix up the spelling of libguile.la.
2010-01-11Have "guile-tools compile" use the current locale.Ludovic Courtès1-1/+2
* meta/guile-tools.in (main): Install the user's locale.
2009-12-20guile-config depends on config.statusAndy Wingo1-1/+1
* meta/Makefile.am (guile-config): Depend on config.status, so that if $prefix changes, guile-config gets rebuilt.
2009-12-15Use portable shell in `meta/uninstalled-env'.Ludovic Courtès1-4/+6
* meta/uninstalled-env.in: Don't use the `-q' and `-E' options, which are specific to GNU grep. Don't set-and-export environment variables at once since this is a GNU Bash extension.
2009-11-24Fix makefile indentation.Ludovic Courtès1-2/+2
* benchmark-suite/Makefile.am, libguile/Makefile.am, meta/Makefile.am: Use TAB instead of 8 spaces... * .x-sc_makefile_check: New file.
2009-10-30* meta/gdb-uninstalled-guile.in: Specify a path to libtool.Ken Raeburn1-1/+1
2009-10-13add $libir to the ltdl path, not $pkglibdir; add extensionsdirAndy Wingo2-2/+3
* libguile/Makefile.am (libpath.h): Fix SCM_LIB_DIR to point to the libdir, not pkglibdir. Add SCM_EXTENSIONS_DIR, for a dir to put in the dynamic-link search path that's not managed by ldconfig or the like; and put this dir in the "extensionsdir" key of %guile-build-info. * libguile/dynl.c (sysdep_dynl_init): Rename the installed-libdir environment var to GUILE_SYSTEM_EXTENSIONS_PATH (from GUILE_SYSTEM_LTDL_PATH). Also add SCM_EXTENSIONS_DIR to the ltdl search path in the default case. * meta/uninstalled-env.in: Adapt override to match. * meta/guile-2.0.pc.in: Add extensionsdir, so you can pkg-config --variable=extensionsdir guile-2.0.
2009-09-26Clean meta/guile-configNeil Jerram1-0/+2
* meta/Makefile.am (CLEANFILES): New, containing guile-config.
2009-09-25Don't include guile-config and guile-tools in distributionNeil Jerram1-1/+1
They need to be regenerated, with the correct prefix, when configure and make run. * meta/Makefile.am (EXTRA_DIST): Remove bin_SCRIPTS.
2009-09-25Fix make distcheck by looking for guile-config in $(srcdir)Neil Jerram1-2/+2
make distcheck is currently failing for me with: In file included from /usr/local/include/libguile/threads.h:35, from /usr/local/include/libguile/async.h:28, from /usr/local/include/libguile.h:37, from ../../examples/box/box.c:22: /usr/local/include/libguile/pthread-threads.h:33:31: error: libguile/boehm-gc.h: No such file or directory In file included from /usr/local/include/libguile.h:93, from ../../examples/box/box.c:22: - which is because it's picking up a load of installed headers, instead of those in the _inst tree - which is because there is no output from the preceding guile-config invocation: PATH=/home/neil/SW/Guile/ovnight/guile-master-20090924/_inst/bin:$PATH PKG_CONFIG_PATH=/home/neil/SW/Guile/ovnight/guile-master-20090924/_inst/lib/pkgconfig /home/neil/SW/Guile/ovnight/guile-master-20090924/_inst/bin/guile-config compile - which is because .../_inst/bin/guile-config is empty - which is because the rule in meta/Makefile.am that generates guile-config is missing $(srcdir), and so doesn't find guile-config.in. * meta/Makefile.am (guile-config): Look for guile-config.in in $(srcdir).
2009-09-24Have `guile-config' close over `pkg-config' and $(pkgconfigdir).Ludovic Courtès2-4/+20
* meta/Makefile.am (guile-config): New target. (EXTRA_DIST): Add `guile-config.in'. * meta/guile-config.in: New, formerly `guile-config'. Use the right installed `guile', with the right $PKG_CONFIG_PATH. Disable auto-compilation. (%pkg-config-program): New variable. (pkg-config): Use it.
2009-09-21Fix GDB in Emacs incantationNeil Jerram1-1/+1
2009-09-17Convenience for running GDB on Guile in EmacsNeil Jerram1-0/+3
* meta/gdb-uninstalled-guile.in: Add (in a comment) an elisp form that can be evaluated to run GDB on Guile in Emacs.
2009-09-16add the libdir to the ltdl lib search pathAndy Wingo1-0/+4
* libguile/Makefile.am (libpath.h): Fix pkgdatadir, pkglibdir, and pkgincludedir entries. Add a new define, SCM_LIB_DIR. * libguile/dynl.c (sysdep_dynl_init): Add the libdir to the libltdl search path. Should fix http://thread.gmane.org/gmane.lisp.guile.bugs/4289/focus=4296 -- that is, it should allow guile to be invoked from whereever it is installed, without munging LTDL_LIBRARY_PATH or the like variables. There is a trick though -- during the build, we don't want to be looking in the $libdir for loadable modules. So as with GUILE_SYSTEM_PATH, we have GUILE_SYSTEM_LTDL_PATH. * meta/uninstalled-env.in: Set GUILE_SYSTEM_LTDL_PATH to "" when building.
2009-08-28Add `BDW_GC_CFLAGS' to the `.pc' files.Ludovic Courtès2-2/+2
This is needed because <gc/gc.h> is included in public headers (via <libguile/boehm-gc.h>. * meta/guile-2.0-uninstalled.pc.in (Cflags): Add `@BDW_GC_CFLAGS'. * meta/guile-2.0.pc.in (Cflags): Likewise.
2009-08-26actually install guile-toolsAndy Wingo1-1/+1
* meta/Makefile.am (bin_SCRIPTS): Re-add guile-tools here (removed in 54b38caf19deb0e5a6e8146c65b3e176e7fffa60). Otherwise guile-tools doesn't get installed. I think that 1.9.2 had this bug.
2009-08-20autocompiled files before installation go to a cache dir in the builddirAndy Wingo2-2/+6
* libguile/load.c (scm_init_load_path): Append a slash after XDG_CACHE_HOME. * meta/gdb-uninstalled-guile.in: * meta/guile.in (XDG_CACHE_HOME): Export this var so we write to a cache within the build directory. Probably we should have a GUILE_CACHE_DIR to be more specific, though. * Makefile.am (clean-local): Clear the cache when making clean.
2009-08-15Add proper `--help' and `--version' for `guile-tools compile'.Ludovic Courtès3-5/+13
* configure.ac: Produce `meta/guile-tools'. * meta/Makefile.am (EXTRA_DIST): Add `guile-tools.in'. (bin_SCRIPTS): Remove `guile-tools'. * meta/uninstalled-env.in (PATH): Add "${top_builddir}/meta". * module/scripts/compile.scm (%options): Add `--version'. (parse-args): Show the offending option name upon error. (show-version): New. (compile): Use `%guile-bug-report-address'.