diff options
| author | Paul Smith <psmith@gnu.org> | 2013-10-19 12:24:14 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2013-10-19 12:24:14 -0400 |
| commit | 3e4aad4a97562431d91b8bf694f1265d182e2273 (patch) | |
| tree | 89712cdb955967aea092bfa7ef1d33da5c723681 /build.template | |
| parent | 4037364b71988b1bd79ecc79b2842f522c53ec39 (diff) | |
| download | make-3e4aad4a97562431d91b8bf694f1265d182e2273.tar.gz | |
[SV 40254] Modify build.sh to work properly with Guile support.
* guile.c (guile_gmake_setup) [HAVE_GUILE]: Define a stub function
when Guile support is not enabled.
* main.c (main) [HAVE_GUILE]: Always invoke guile_gmake_setup().
* Makefile.am: Make guile.c standard, not optional.
* build.template: Add the Guile compiler and linker flags.
Diffstat (limited to 'build.template')
| -rw-r--r-- | build.template | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build.template b/build.template index 1a06ec6f..1565b725 100644 --- a/build.template +++ b/build.template @@ -22,11 +22,11 @@ srcdir='@srcdir@' CC='@CC@' -CFLAGS='@CFLAGS@' +CFLAGS='@CFLAGS@ @GUILE_CFLAGS@' CPPFLAGS='@CPPFLAGS@' -LDFLAGS='@LDFLAGS@' +LDFLAGS='@AM_LDFLAGS@ @LDFLAGS@' ALLOCA='@ALLOCA@' -LOADLIBES='@LIBS@ @LIBINTL@' +LOADLIBES='@LIBS@ @GUILE_LIBS@ @LIBINTL@' eval extras=\'@LIBOBJS@\' REMOTE='@REMOTE@' GLOBLIB='@GLOBLIB@' @@ -46,7 +46,7 @@ includedir=${prefix}/include localedir=${prefix}/share/locale aliaspath=${localedir}${PATH_SEPARATOR}. -defines="-DALIASPATH=\"${aliaspath}\" -DLOCALEDIR=\"${localedir}\" -DLIBDIR=\"${libdir}\" -DINCLUDEDIR=\"${includedir}\""' @DEFS@' +defines="-DLOCALEDIR=\"${localedir}\" -DLIBDIR=\"${libdir}\" -DINCLUDEDIR=\"${includedir}\""' @DEFS@' # Exit as soon as any command fails. set -e |