Working --enable-elpa with conditional build

diff --git a/Makefile.in b/Makefile.in
index 300a592175284b34c63bc20cbe6fb729207e44c5..8e196074281f459ddad45a89b57456178ebb3e87 100644 (file)
--- 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 e1e6072c53a9e5f9a91f3a2310849f990cadb58d..b6f760e378be6d9785a33808c178e4f4da4cf748 100644 (file)
--- 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 06ffd39b8aa71efa98d4e7e962677c7231879dc0..91c003807721b3c6a8fa1aa6eee7c2df455256f3 100644 (file)
--- a/elpa/Makefile.in
+++ b/elpa/Makefile.in
@@ -1,9 +1,12 @@
+ELPA_IN_CORE=@ELPA_IN_CORE@
+ELPA_LOCAL_PATH=@ELPA_LOCAL_PATH@
 ## 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