[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/core-elpa-by-copy fd618c5 08/13: Working --enable-
From: |
Phillip Lord |
Subject: |
[Emacs-diffs] feature/core-elpa-by-copy fd618c5 08/13: Working --enable-elpa with conditional build |
Date: |
Sat, 26 Jan 2019 05:29:37 -0500 (EST) |
branch: feature/core-elpa-by-copy
commit fd618c569785e7ab9921ac95599245abd0d63370
Author: Phillip Lord <address@hidden>
Commit: Phillip Lord <address@hidden>
Working --enable-elpa with conditional build
---
Makefile.in | 3 +++
configure.ac | 14 ++++++--------
elpa/Makefile.in | 5 ++++-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 300a592..8e19607 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -429,7 +429,10 @@ src: Makefile
$(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all
elpa:
+ ifeq ($(ELPA_IN_CORE),yes)
$(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all
+ endif
+
blessmail: Makefile src
$(MAKE) -C lib-src maybe-blessmail
diff --git a/configure.ac b/configure.ac
index e1e6072..b6f760e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -543,15 +543,11 @@ elif test "${enableval}" != "yes"; then
fi)
AC_ARG_ENABLE(elpa,
-[AS_HELP_STRING([--enable-elpa=PATH],
- [enable ELPA in core.])],
-if test "${enableval}" = "no"; then
+[AS_HELP_STRING([--enable-elpa],
+ [Copy Selected ELPA files into core])],
+ ELPA_IN_CORE=$enableval,
ELPA_IN_CORE=
- ELPA_LOCAL_PATH=
-elif test "${enableval}" != "yes"; then
- ELPA_IN_CORE=true
- ELPA_LOCAL_PATH=${enableval}
-fi)
+)
AC_ARG_ENABLE(checking,
[AS_HELP_STRING([--enable-checking@<:@=LIST@:>@],
@@ -5180,6 +5176,8 @@ AC_SUBST(ns_appresdir)
AC_SUBST(ns_appsrc)
AC_SUBST(GNU_OBJC_CFLAGS)
AC_SUBST(OTHER_FILES)
+AC_SUBST(ELPA_IN_CORE)
+AC_SUBST(ELPA_LOCAL_PATH)
if test -n "${term_header}"; then
AC_DEFINE_UNQUOTED(TERM_HEADER, "${term_header}",
diff --git a/elpa/Makefile.in b/elpa/Makefile.in
index 06ffd39..91c0038 100644
--- a/elpa/Makefile.in
+++ b/elpa/Makefile.in
@@ -1,9 +1,12 @@
address@hidden@
address@hidden@
## Get this stuff from above
dirstate = .git/logs/HEAD
VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
-all: all-packages
+all:
+ echo Lets build ELPA!
../lisp/elpa:
mkdir ../lisp/elpa
- [Emacs-diffs] branch feature/core-elpa-by-copy created (now 05e20b8), Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 084a0c4 01/13: Initial notes (to be removed!), Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy e2cf6b1 05/13: Top level make file plumbing, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 4f0ca28 03/13: Build process started, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy bf7519e 12/13: And dependencies all working, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 05e20b8 13/13: Fix dependency between packages and ELPA checkout, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy e26f1ab 06/13: Fix concurrent build, add some more, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy fd618c5 08/13: Working --enable-elpa with conditional build,
Phillip Lord <=
- [Emacs-diffs] feature/core-elpa-by-copy b3dad07 07/13: Semi working attempt to get configure to work, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 69f8ceb 10/13: Working Configurable checkout for elpa, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy e557b18 11/13: Depedency mostly working, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 2cfe571 02/13: Extraction of code working, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy a5f5801 04/13: Probably working but untested version, Phillip Lord, 2019/01/26
- [Emacs-diffs] feature/core-elpa-by-copy 9594e37 09/13: Configurable location for git checkout, Phillip Lord, 2019/01/26