summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2001-04-26 15:36:46 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2001-04-26 15:36:46 +0000
commit2611fffa9156800a5493b0441714be3e2760a113 (patch)
tree88c9f685aae827c35fc810ea03e3334136f5d904 /editors
parentUpdate to version 0.3.0 (diff)
Add the NO_GUI knob for those who want a hugely-featured Vim, but don't
want the X depandancy. Bow to numerous wishes(yelling) to make GTK the default GUI lib vs. Motif. Bram (Vim author) prefering GTK over Open Motif weighed kinda heavy. With my dislike of the GPV and their political agenda, I have been resisting this demand. [I fully agree with the reasons why the `ddd' debugger didn't use GTK until the GNU people got a hold of it] GNU's NIH and "brace and extend" is often as bad as Microsoft's. And often the only reason people put up with it is because of they like to force GNU Public Virused software forces down our throat. Some argue that GTK is "smaller" than OpenMotif. Maybe GTK 1.2 is (but don't forget to look at the GTK depends, where OpenMotif has none). But GTK 1.3 definitely is not smaller than OpenMotif (just look at its dependancy list). I will review my decision to use GTK as default GUI when the GTK+ 1.{3,4} behemoth is released.
Notes
Notes: svn path=/head/; revision=41924
Diffstat (limited to 'editors')
-rw-r--r--editors/vim/Makefile13
-rw-r--r--editors/vim6/Makefile13
2 files changed, 22 insertions, 4 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index b453cb249c59..60e97b92d703 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -51,17 +51,26 @@ MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_ARGS+= CONF_OPT_MAX="--enable-max-features"
I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
+.if !defined(NO_GUI)
+# for now default the GUI to the GTK+ one
+# will be reviewed when the GTK+ 1.{3,4} behemoth is released
+.if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF)
+WITH_GTK= yes
+.endif
+
.if defined(WITH_ATHENA)
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
-#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N}
.elif defined(WITH_GTK)
USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
-.else
+.elif defined(WITH_MOTIF)
USE_MOTIF= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
.endif
+.else # NO_GUI
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}"
+.endif # NO_GUI
.if defined(PACKAGE_BUILDING)
MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index b453cb249c59..60e97b92d703 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -51,17 +51,26 @@ MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_ARGS+= CONF_OPT_MAX="--enable-max-features"
I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
+.if !defined(NO_GUI)
+# for now default the GUI to the GTK+ one
+# will be reviewed when the GTK+ 1.{3,4} behemoth is released
+.if !defined(WITH_ATHENA) && !defined(WITH_GTK) && !defined(WITH_MOTIF)
+WITH_GTK= yes
+.endif
+
.if defined(WITH_ATHENA)
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
-#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N}
.elif defined(WITH_GTK)
USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
-.else
+.elif defined(WITH_MOTIF)
USE_MOTIF= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
.endif
+.else # NO_GUI
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=no --without-x ${I18N}"
+.endif # NO_GUI
.if defined(PACKAGE_BUILDING)
MAKE_ARGS+= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope"