summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile55
-rwxr-xr-xsrc/auto/configure96
-rw-r--r--src/configure.ac52
-rw-r--r--src/version.c2
4 files changed, 36 insertions, 169 deletions
diff --git a/src/Makefile b/src/Makefile
index 5eae1a47f..0b5e7ce86 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -21,8 +21,8 @@
# the first column of a line is removed.
# - If you want a version of Vim that is small and starts up quickly,
# you might want to disable the GUI, X11, Perl, Python and Tcl.
-# - Uncomment the line with --disable-gui if you have Motif, GTK and/or
-# Athena but don't want to make gvim (the GUI version of Vim with nice
+# - Uncomment the line with --disable-gui if you have Motif and/or GTK
+# but don't want to make gvim (the GUI version of Vim with nice
# menus and scrollbars, but makes Vim bigger and startup slower).
# - Uncomment --disable-darwin if on Mac OS X but you want to compile a
# Unix version.
@@ -329,7 +329,7 @@ CClink = $(CC)
# GUI - For creating Vim with GUI (gvim) (B)
# Uncomment this line when you don't want to get the GUI version, although you
-# have GTK, Motif and/or Athena. Also use --without-x if you don't want X11
+# have GTK and/or Motif. Also use --without-x if you don't want X11
# at all.
#CONF_OPT_GUI = --disable-gui
@@ -343,12 +343,11 @@ CClink = $(CC)
#CONF_OPT_GUI = --enable-gnome-check
#CONF_OPT_GUI = --disable-gtk3-check
#CONF_OPT_GUI = --disable-motif-check
-#CONF_OPT_GUI = --disable-athena-check
#CONF_OPT_GUI = --disable-nextaw-check
# Uncomment one of these lines to select a specific GUI to use.
# When using "yes" or nothing, configure will use the first one found: GTK+,
-# Motif or Athena.
+# or Motif.
#
# GTK versions that are known not to work 100% are rejected.
# Use "--disable-gtktest" to accept them anyway.
@@ -372,7 +371,6 @@ CClink = $(CC)
#CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest
#CONF_OPT_GUI = --enable-gui=motif
#CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared"
-#CONF_OPT_GUI = --enable-gui=athena
#CONF_OPT_GUI = --enable-gui=nextaw
# Uncomment this line to run an individual test with gvim.
@@ -793,13 +791,6 @@ SANITIZER_LIBS = $(SANITIZER_CFLAGS)
#X_LIBS_DIR = -L/usr/openwin/lib -R/usr/openwin/lib
#CFLAGS = -O
-### (9) Solaris 2.x with cc (SunPro), using Athena.
-### Only required for compiling gui_at_sb.c.
-### Symptom: "identifier redeclared: vim_XawScrollbarSetThumb"
-### Use one of the lines (either Full ANSI or no ANSI at all)
-#CFLAGS = $(CFLAGS) -Xc
-#CFLAGS = $(CFLAGS) -Xs
-
### Solaris 2.3 with X11 and specific cc
#CC=/opt/SUNWspro/bin/cc -O -Xa -v -R/usr/openwin/lib
@@ -1261,8 +1252,8 @@ LINKIT = @echo >/dev/null
### 'configure --enable-gui' can enable one of these for you if you did set
### a corresponding CONF_OPT_GUI above and have X11.
### Override configures choice by uncommenting all the following lines.
-### As they are, the GUI is disabled. Replace "NONE" with "ATHENA" or "MOTIF"
-### for enabling the Athena or Motif GUI.
+### As they are, the GUI is disabled. Replace "NONE" with "MOTIF"
+### for enabling the Motif GUI.
#GUI_SRC = $(NONE_SRC)
#GUI_OBJ = $(NONE_OBJ)
#GUI_DEFS = $(NONE_DEFS)
@@ -1313,36 +1304,6 @@ MOTIF_MAN_TARGETS = yes
MOTIF_TESTTARGET = gui
MOTIF_BUNDLE =
-### Athena GUI
-### Use Xaw3d to make the menus look a little bit nicer
-#XAW_LIB = -lXaw3d
-XAW_LIB = -lXaw
-
-### When using Xaw3d, uncomment/comment the following lines to also get the
-### scrollbars from Xaw3d.
-#ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c
-#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
-# objects/gui_beval.o objects/gui_at_fs.o
-#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
-# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
-# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
-ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c \
- gui_at_sb.c gui_at_fs.c
-ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
- objects/gui_beval.o \
- objects/gui_at_sb.o objects/gui_at_fs.o
-ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
-
-ATHENA_IPATH = $(GUI_INC_LOC)
-ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
-ATHENA_LIBS1 = $(XAW_LIB)
-ATHENA_LIBS2 = -lXt
-ATHENA_INSTALL = install_normal install_gui_extra
-ATHENA_TARGETS = installglinks
-ATHENA_MAN_TARGETS = yes
-ATHENA_TESTTARGET = gui
-ATHENA_BUNDLE =
-
### neXtaw GUI
NEXTAW_LIB = -lneXtaw
@@ -2240,7 +2201,7 @@ os_vms.pro: os_vms.c
# must use os_vms_conf.h for auto/config.h
mv auto/config.h auto/config.h.save
cp os_vms_conf.h auto/config.h
- $(CPROTO) -DVMS -UFEAT_GUI_ATHENA -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
+ $(CPROTO) -DVMS -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
echo "/* vim: set ft=c : */" >> proto/$@
rm auto/config.h
mv auto/config.h.save auto/config.h
@@ -2258,7 +2219,7 @@ notags:
-rm -f tags
# Note: tags is made for the currently configured version, can't include both
-# Motif and Athena GUI
+# Motif and neXtaw GUI
# You can ignore error messages for missing files.
tags TAGS: notags
$(TAGPRG) $(TAGS_FILES)
diff --git a/src/auto/configure b/src/auto/configure
index 09abdf1bc..8858e41f5 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -834,7 +834,6 @@ enable_gtk2_check
enable_gnome_check
enable_gtk3_check
enable_motif_check
-enable_athena_check
enable_nextaw_check
enable_gtktest
with_gnome_includes
@@ -1509,12 +1508,11 @@ Optional Features:
--disable-farsi Deprecated.
--enable-xim Include XIM input support.
--enable-fontset Include X fontset output support.
- --enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/haiku/photon/carbon
+ --enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/neXtaw/haiku/photon/carbon
--enable-gtk2-check If auto-select GUI, check for GTK+ 2 default=yes
--enable-gnome-check If GTK GUI, check for GNOME default=no
--enable-gtk3-check If auto-select GUI, check for GTK+ 3 default=yes
--enable-motif-check If auto-select GUI, check for Motif default=yes
- --enable-athena-check If auto-select GUI, check for Athena default=yes
--enable-nextaw-check If auto-select GUI, check for neXtaw default=yes
--disable-gtktest Do not try to compile and run a test GTK program
--disable-icon-cache-update update disabled
@@ -1523,7 +1521,7 @@ Optional Features:
--disable-canberra Do not use libcanberra.
--disable-libsodium Do not use libsodium.
--disable-acl No check for ACL support.
- --disable-gpm Don't use gpm (Linux mouse daemon).
+ --enable-gpm=OPTS Use gpm (Linux mouse daemon). default=yes OPTS=yes/no/dynamic
--disable-sysmouse Don't use sysmouse (mouse in *BSD console).
--disable-nls Don't support NLS (gettext()).
@@ -4787,7 +4785,7 @@ rm -f core conftest.err conftest.$ac_objext \
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"
- if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
+ if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
with_x=no
fi
fi
@@ -9274,7 +9272,6 @@ SKIP_GTK2=YES
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
-SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
@@ -9336,7 +9333,6 @@ $as_echo "yes/auto - automatic GUI support" >&6; }
SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
- SKIP_ATHENA=
SKIP_NEXTAW=;;
gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5
$as_echo "GTK+ 2.x GUI support" >&6; }
@@ -9351,9 +9347,6 @@ $as_echo "GTK+ 3.x GUI support" >&6; }
motif) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5
$as_echo "Motif GUI support" >&6; }
SKIP_MOTIF=;;
- athena) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Athena GUI support" >&5
-$as_echo "Athena GUI support" >&6; }
- SKIP_ATHENA=;;
nextaw) { $as_echo "$as_me:${as_lineno-$LINENO}: result: neXtaw GUI support" >&5
$as_echo "neXtaw GUI support" >&6; }
SKIP_NEXTAW=;;
@@ -9433,23 +9426,6 @@ $as_echo "$enable_motif_check" >&6; }
fi
fi
-if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Athena" >&5
-$as_echo_n "checking whether or not to look for Athena... " >&6; }
- # Check whether --enable-athena-check was given.
-if test "${enable_athena_check+set}" = set; then :
- enableval=$enable_athena_check;
-else
- enable_athena_check="yes"
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_athena_check" >&5
-$as_echo "$enable_athena_check" >&6; }
- if test "x$enable_athena_check" = "xno"; then
- SKIP_ATHENA=YES
- fi
-fi
-
if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for neXtaw" >&5
$as_echo_n "checking whether or not to look for neXtaw... " >&6; }
@@ -9735,7 +9711,6 @@ $as_echo "no" >&6; }
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK3=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
@@ -9995,7 +9970,6 @@ $as_echo "no" >&6; }
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
@@ -10302,48 +10276,11 @@ $as_echo "<not found>" >&6; }
fi
if test -z "$SKIP_MOTIF"; then
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
GUITYPE=MOTIF
fi
-
-GUI_X_LIBS=
-
-if test -z "$SKIP_ATHENA"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Athena header files can be found" >&5
-$as_echo_n "checking if Athena header files can be found... " >&6; }
- cflags_save=$CFLAGS
- CFLAGS="$CFLAGS $X_CFLAGS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <X11/Intrinsic.h>
-#include <X11/Xaw/Paned.h>
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; SKIP_ATHENA=YES
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$cflags_save
-fi
-
-if test -z "$SKIP_ATHENA"; then
- GUITYPE=ATHENA
-fi
-
if test -z "$SKIP_NEXTAW"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if neXtaw header files can be found" >&5
$as_echo_n "checking if neXtaw header files can be found... " >&6; }
@@ -10377,7 +10314,7 @@ if test -z "$SKIP_NEXTAW"; then
GUITYPE=NEXTAW
fi
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
+if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
if test -n "$GUI_INC_LOC"; then
GUI_INC_LOC=-I"`echo $GUI_INC_LOC|sed 's%-I%%'`"
fi
@@ -10636,7 +10573,7 @@ done
fi
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
+if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
for ac_header in X11/xpm.h X11/Sunkeysym.h
@@ -10680,7 +10617,7 @@ $as_echo "X GUI selected; xim has been enabled" >&6; }
fi
fi
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
+if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/Xmu/Editres.h" >&5
@@ -13845,8 +13782,8 @@ rm -f core conftest.err conftest.$ac_objext \
LIBS="$ac_save_LIBS"
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-gpm argument" >&5
-$as_echo_n "checking --disable-gpm argument... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gpm argument" >&5
+$as_echo_n "checking --enable-gpm argument... " >&6; }
# Check whether --enable-gpm was given.
if test "${enable_gpm+set}" = set; then :
enableval=$enable_gpm;
@@ -13855,9 +13792,9 @@ else
fi
-if test "$enable_gpm" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+if test "$enable_gpm" = "yes" -o "$enable_gpm" = "dynamic"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gpm" >&5
+$as_echo "$enable_gpm" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5
$as_echo_n "checking for gpm... " >&6; }
if ${vi_cv_have_gpm+:} false; then :
@@ -13889,13 +13826,18 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5
$as_echo "$vi_cv_have_gpm" >&6; }
if test $vi_cv_have_gpm = yes; then
- LIBS="$LIBS -lgpm"
+ if test "$enable_gpm" = "yes"; then
+ LIBS="$LIBS -lgpm"
+ else
+ $as_echo "#define DYNAMIC_GPM 1" >>confdefs.h
+
+ fi
$as_echo "#define HAVE_GPM 1" >>confdefs.h
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5
diff --git a/src/configure.ac b/src/configure.ac
index 4dd74fc2a..68fa87ef5 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -291,8 +291,8 @@ if test "$vim_cv_uname_output" = Darwin; then
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"
dnl Assume we don't want X11 unless it was specifically asked for
- dnl (--with-x) or Motif, Athena or GTK GUI is used.
- if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
+ dnl (--with-x) or Motif or GTK GUI is used.
+ if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
with_x=no
fi
fi
@@ -2443,7 +2443,7 @@ test "x$with_x" = xno -a "x$HAIKU" != "xyes" -a "x$MACOS_X" != "xyes" -a "x$QNX"
AC_MSG_CHECKING(--enable-gui argument)
AC_ARG_ENABLE(gui,
- [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/haiku/photon/carbon]], , enable_gui="auto")
+ [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/neXtaw/haiku/photon/carbon]], , enable_gui="auto")
dnl Canonicalize the --enable-gui= argument so that it can be easily compared.
dnl Do not use character classes for portability with old tools.
@@ -2455,7 +2455,6 @@ SKIP_GTK2=YES
SKIP_GTK3=YES
SKIP_GNOME=YES
SKIP_MOTIF=YES
-SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_PHOTON=YES
SKIP_HAIKU=YES
@@ -2502,7 +2501,6 @@ else
SKIP_GTK3=
SKIP_GNOME=
SKIP_MOTIF=
- SKIP_ATHENA=
SKIP_NEXTAW=;;
gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support)
SKIP_GTK2=;;
@@ -2513,8 +2511,6 @@ else
SKIP_GTK3=;;
motif) AC_MSG_RESULT(Motif GUI support)
SKIP_MOTIF=;;
- athena) AC_MSG_RESULT(Athena GUI support)
- SKIP_ATHENA=;;
nextaw) AC_MSG_RESULT(neXtaw GUI support)
SKIP_NEXTAW=;;
*) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
@@ -2568,17 +2564,6 @@ if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then
fi
fi
-if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
- AC_MSG_CHECKING(whether or not to look for Athena)
- AC_ARG_ENABLE(athena-check,
- [ --enable-athena-check If auto-select GUI, check for Athena [default=yes]],
- , enable_athena_check="yes")
- AC_MSG_RESULT($enable_athena_check)
- if test "x$enable_athena_check" = "xno"; then
- SKIP_ATHENA=YES
- fi
-fi
-
if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
AC_MSG_CHECKING(whether or not to look for neXtaw)
AC_ARG_ENABLE(nextaw-check,
@@ -2821,7 +2806,6 @@ if test -z "$SKIP_GTK2"; then
GUI_INC_LOC="$GTK_CFLAGS"], )
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK3=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
@@ -2872,7 +2856,6 @@ if test -z "$SKIP_GTK3"; then
if test "x$GTK_CFLAGS" != "x"; then
SKIP_GTK2=YES
SKIP_GNOME=YES
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
SKIP_MOTIF=YES
GUITYPE=GTK
@@ -3034,32 +3017,11 @@ if test -z "$SKIP_MOTIF"; then
fi
if test -z "$SKIP_MOTIF"; then
- SKIP_ATHENA=YES
SKIP_NEXTAW=YES
GUITYPE=MOTIF
AC_SUBST(MOTIF_LIBNAME)
fi
-dnl Check if the Athena files can be found
-
-GUI_X_LIBS=
-
-if test -z "$SKIP_ATHENA"; then
- AC_MSG_CHECKING(if Athena header files can be found)
- cflags_save=$CFLAGS
- CFLAGS="$CFLAGS $X_CFLAGS"
- AC_TRY_COMPILE([
-#include <X11/Intrinsic.h>
-#include <X11/Xaw/Paned.h>], ,
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no); SKIP_ATHENA=YES )
- CFLAGS=$cflags_save
-fi
-
-if test -z "$SKIP_ATHENA"; then
- GUITYPE=ATHENA
-fi
-
if test -z "$SKIP_NEXTAW"; then
AC_MSG_CHECKING(if neXtaw header files can be found)
cflags_save=$CFLAGS
@@ -3076,7 +3038,7 @@ if test -z "$SKIP_NEXTAW"; then
GUITYPE=NEXTAW
fi
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
+if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
dnl Prepend -I and -L to $GUI_INC_LOC and $GUI_LIB_LOC if not empty
dnl Avoid adding it when it twice
if test -n "$GUI_INC_LOC"; then
@@ -3138,7 +3100,7 @@ if test "$enable_xsmp" = "yes"; then
fi
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
+if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
dnl Check for X11/xpm.h and X11/Sunkeysym.h with the GUI include path
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -3160,7 +3122,7 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_
fi
fi
-if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
+if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
dnl Xmu/Editres.h may exist but can only be used after including Intrinsic.h
@@ -3175,7 +3137,7 @@ dnl Xmu/Editres.h may exist but can only be used after including Intrinsic.h
CPPFLAGS=$cppflags_save
fi
-dnl Only use the Xm directory when compiling Motif, don't use it for Athena
+dnl Only use the Xm directory when compiling Motif.
if test -z "$SKIP_MOTIF"; then
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
diff --git a/src/version.c b/src/version.c
index c089b02aa..794591003 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4527,
+/**/
4526,
/**/
4525,
View Lorry Controller Status