masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes: debbugs:19850

Browse source 
* configure.ac: Set locallisppath to empty for NS self contained,
unless --enable-loadllisppath was given.
This commit is contained in:
Jan D 2015-02-13 17:44:26 +01:00
parent a03ab7eaf5
commit b9d8edcf6d
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2015-02-09 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (HAVE_LIBXML2): Add missing comma. * configure.ac (HAVE_LIBXML2): Add missing comma.

4
configure.ac
View file

@ -423,6 +423,7 @@ AC_ARG_ENABLE(ns-self-contained,
EN_NS_SELF_CONTAINED=$enableval, EN_NS_SELF_CONTAINED=$enableval,
EN_NS_SELF_CONTAINED=yes) EN_NS_SELF_CONTAINED=yes)
locallisppathset=no
AC_ARG_ENABLE(locallisppath, AC_ARG_ENABLE(locallisppath,
[AS_HELP_STRING([--enable-locallisppath=PATH], [AS_HELP_STRING([--enable-locallisppath=PATH],
[directories Emacs should search for lisp files specific [directories Emacs should search for lisp files specific
@ -430,7 +431,7 @@ AC_ARG_ENABLE(locallisppath,
if test "${enableval}" = "no"; then if test "${enableval}" = "no"; then
locallisppath= locallisppath=
elif test "${enableval}" != "yes"; then elif test "${enableval}" != "yes"; then
locallisppath=${enableval} locallisppath=${enableval} locallisppathset=yes
fi) fi)
AC_ARG_ENABLE(checking, AC_ARG_ENABLE(checking,
@ -1871,6 +1872,7 @@ if test "${HAVE_NS}" = yes; then
infodir="\${ns_appresdir}/info" infodir="\${ns_appresdir}/info"
mandir="\${ns_appresdir}/man" mandir="\${ns_appresdir}/man"
lispdir="\${ns_appresdir}/lisp" lispdir="\${ns_appresdir}/lisp"
test "$locallisppathset" = no && locallisppath=""
INSTALL_ARCH_INDEP_EXTRA= INSTALL_ARCH_INDEP_EXTRA=
fi fi