[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b9d8edc: Fixes: debbugs:19850
From: |
Jan D. |
Subject: |
[Emacs-diffs] master b9d8edc: Fixes: debbugs:19850 |
Date: |
Fri, 13 Feb 2015 16:44:35 +0000 |
branch: master
commit b9d8edcf6dbe5651919bfb42687d16794f2d86f8
Author: Jan D <address@hidden>
Commit: Jan D <address@hidden>
Fixes: debbugs:19850
* configure.ac: Set locallisppath to empty for NS self contained,
unless --enable-loadllisppath was given.
---
ChangeLog | 5 +++++
configure.ac | 4 +++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a574ac8..4365668 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-13 Jan Djärv <address@hidden>
+
+ * configure.ac: Set locallisppath to empty for NS self contained,
+ unless --enable-loadllisppath was given (Bug#19850).
+
2015-02-09 Paul Eggert <address@hidden>
* configure.ac (HAVE_LIBXML2): Add missing comma.
diff --git a/configure.ac b/configure.ac
index 68291b8..0bcc55c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -423,6 +423,7 @@ AC_ARG_ENABLE(ns-self-contained,
EN_NS_SELF_CONTAINED=$enableval,
EN_NS_SELF_CONTAINED=yes)
+locallisppathset=no
AC_ARG_ENABLE(locallisppath,
[AS_HELP_STRING([--enable-locallisppath=PATH],
[directories Emacs should search for lisp files specific
@@ -430,7 +431,7 @@ AC_ARG_ENABLE(locallisppath,
if test "${enableval}" = "no"; then
locallisppath=
elif test "${enableval}" != "yes"; then
- locallisppath=${enableval}
+ locallisppath=${enableval} locallisppathset=yes
fi)
AC_ARG_ENABLE(checking,
@@ -1871,6 +1872,7 @@ if test "${HAVE_NS}" = yes; then
infodir="\${ns_appresdir}/info"
mandir="\${ns_appresdir}/man"
lispdir="\${ns_appresdir}/lisp"
+ test "$locallisppathset" = no && locallisppath=""
INSTALL_ARCH_INDEP_EXTRA=
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b9d8edc: Fixes: debbugs:19850,
Jan D. <=