New commits:
commit 1dcac5b324d8c70117d298d9cbd121d4f07ef366
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
editors/emacs: added new dependencies and features, corrected code for
scm branch + cleanups
diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD
index c079582..9c6ef57 100755
--- a/editors/emacs/BUILD
+++ b/editors/emacs/BUILD
@@ -12,27 +12,12 @@ export LDFLAGS="${LDFLAGS//-Wl,-O1/}" &&
# XXX Causes a segfault during the bootstrapping
CFLAGS="${CFLAGS/-ftree-loop-if-convert-stores}" &&
-OPTS="$OPTS --with-x-toolkit=$EMACS_XTOOLKIT" &&
+OPTS="${OPTS} --with-x-toolkit=${EMACS_XTOOLKIT} ${EMACS_OPTS}" &&
if [[ "$EMACS_BRANCH" == "scm" ]]; then
# Crashes with -O3
export CFLAGS="${CFLAGS//-O3/-O2}" &&
- OPTS="$OPTS --build=${BUILD}" &&
-
- if [[ $CROSS_INSTALL == on ]]; then
- OPTS="$OPTS --host=${HOST}"
- fi &&
-
- # Fix broken permissions
- chmod +x build-aux/update-subdirs &&
-
- ./autogen.sh &&
- ./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- $OPTS &&
+ default_build_configure &&
make bootstrap
else
default_build
diff --git a/editors/emacs/CONFIGURE b/editors/emacs/CONFIGURE
index 4340986..081abd1 100755
--- a/editors/emacs/CONFIGURE
+++ b/editors/emacs/CONFIGURE
@@ -1,2 +1,5 @@
config_query_list EMACS_XTOOLKIT "Select the X toolkit:" \
- gtk gtk3 lucid motif no
+ gtk gtk3 lucid motif no &&
+
+config_query_option EMACS_OPTS "Enable dynamic modules support?" n \
+ "--with-modules" "--without-modules"
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index 525574b..51e5fa7 100755
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -1,9 +1,10 @@
case "$EMACS_XTOOLKIT" in
lucid)
optional_depends xaw3d \
- --with{,out}-xaw3d \
- "for fancy 3D-style scroll bars" &&
- if ! is_depends_enabled $SPELL xaw3d; then
+ "--with-xaw3d" \
+ "--without-xaw3d" \
+ "for fancy 3D-style scroll bars" &&
+ if ! is_depends_enabled ${SPELL} xaw3d; then
depends libxaw
fi
;;
@@ -11,7 +12,11 @@ case "$EMACS_XTOOLKIT" in
depends gtk+2
;;
gtk3)
- depends gtk+3
+ depends gtk+3 &&
+ optional_depends "webkitgtk3" \
+ "--with-xwidgets" \
+ "--without-xwidgets" \
+ "for XWidgets support"
;;
motif)
depends MOTIF
@@ -39,24 +44,24 @@ optional_depends "tiff" \
"--without-tiff" \
"for TIFF format support" &&