diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index a574ac86e24..43656680f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-13 Jan Djärv <jan.h.d@swipnet.se> + + * configure.ac: Set locallisppath to empty for NS self contained, + unless --enable-loadllisppath was given (Bug#19850). + 2015-02-09 Paul Eggert <eggert@cs.ucla.edu> * configure.ac (HAVE_LIBXML2): Add missing comma. diff --git a/configure.ac b/configure.ac index 68291b8950b..0bcc55c4c20 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 |