Skip to content

Commit 0b40d08

Browse files
brammoolbrammool
committed
patch 8.2.4527: the Athena GUI is old and does not work well
Problem: The Athena GUI is old and does not work well. Solution: Remove the Athena GUI from configure to find out who still wants support for this GUI.
1 parent 8acb9cc commit 0b40d08

File tree

4 files changed

+36
-169
lines changed

4 files changed

+36
-169
lines changed

‎src/Makefile‎

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
# the first column of a line is removed.
2222
# - If you want a version of Vim that is small and starts up quickly,
2323
# you might want to disable the GUI, X11, Perl, Python and Tcl.
24-
# - Uncomment the line with --disable-gui if you have Motif, GTK and/or
25-
# Athena but don't want to make gvim (the GUI version of Vim with nice
24+
# - Uncomment the line with --disable-gui if you have Motif and/or GTK
25+
# but don't want to make gvim (the GUI version of Vim with nice
2626
# menus and scrollbars, but makes Vim bigger and startup slower).
2727
# - Uncomment --disable-darwin if on Mac OS X but you want to compile a
2828
# Unix version.
@@ -329,7 +329,7 @@ CClink = $(CC)
329329

330330
# GUI - For creating Vim with GUI (gvim) (B)
331331
# Uncomment this line when you don't want to get the GUI version, although you
332-
# have GTK, Motif and/or Athena. Also use --without-x if you don't want X11
332+
# have GTK and/or Motif. Also use --without-x if you don't want X11
333333
# at all.
334334
#CONF_OPT_GUI = --disable-gui
335335

@@ -343,12 +343,11 @@ CClink = $(CC)
343343
#CONF_OPT_GUI = --enable-gnome-check
344344
#CONF_OPT_GUI = --disable-gtk3-check
345345
#CONF_OPT_GUI = --disable-motif-check
346-
#CONF_OPT_GUI = --disable-athena-check
347346
#CONF_OPT_GUI = --disable-nextaw-check
348347

349348
# Uncomment one of these lines to select a specific GUI to use.
350349
# When using "yes" or nothing, configure will use the first one found: GTK+,
351-
# Motif or Athena.
350+
# or Motif.
352351
#
353352
# GTK versions that are known not to work 100% are rejected.
354353
# Use "--disable-gtktest" to accept them anyway.
@@ -372,7 +371,6 @@ CClink = $(CC)
372371
#CONF_OPT_GUI = --enable-gui=gtk3 --disable-gtktest
373372
#CONF_OPT_GUI = --enable-gui=motif
374373
#CONF_OPT_GUI = --enable-gui=motif --with-motif-lib="-static -lXm -shared"
375-
#CONF_OPT_GUI = --enable-gui=athena
376374
#CONF_OPT_GUI = --enable-gui=nextaw
377375

378376
# Uncomment this line to run an individual test with gvim.
@@ -793,13 +791,6 @@ SANITIZER_LIBS = $(SANITIZER_CFLAGS)
793791
#X_LIBS_DIR = -L/usr/openwin/lib -R/usr/openwin/lib
794792
#CFLAGS = -O
795793

796-
### (9) Solaris 2.x with cc (SunPro), using Athena.
797-
### Only required for compiling gui_at_sb.c.
798-
### Symptom: "identifier redeclared: vim_XawScrollbarSetThumb"
799-
### Use one of the lines (either Full ANSI or no ANSI at all)
800-
#CFLAGS = $(CFLAGS) -Xc
801-
#CFLAGS = $(CFLAGS) -Xs
802-
803794
### Solaris 2.3 with X11 and specific cc
804795
#CC=/opt/SUNWspro/bin/cc -O -Xa -v -R/usr/openwin/lib
805796

@@ -1261,8 +1252,8 @@ LINKIT = @echo >/dev/null
12611252
### 'configure --enable-gui' can enable one of these for you if you did set
12621253
### a corresponding CONF_OPT_GUI above and have X11.
12631254
### Override configures choice by uncommenting all the following lines.
1264-
### As they are, the GUI is disabled. Replace "NONE" with "ATHENA" or "MOTIF"
1265-
### for enabling the Athena or Motif GUI.
1255+
### As they are, the GUI is disabled. Replace "NONE" with "MOTIF"
1256+
### for enabling the Motif GUI.
12661257
#GUI_SRC = $(NONE_SRC)
12671258
#GUI_OBJ = $(NONE_OBJ)
12681259
#GUI_DEFS = $(NONE_DEFS)
@@ -1313,36 +1304,6 @@ MOTIF_MAN_TARGETS = yes
13131304
MOTIF_TESTTARGET = gui
13141305
MOTIF_BUNDLE =
13151306

1316-
### Athena GUI
1317-
### Use Xaw3d to make the menus look a little bit nicer
1318-
#XAW_LIB = -lXaw3d
1319-
XAW_LIB = -lXaw
1320-
1321-
### When using Xaw3d, uncomment/comment the following lines to also get the
1322-
### scrollbars from Xaw3d.
1323-
#ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c gui_at_fs.c
1324-
#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
1325-
# objects/gui_beval.o objects/gui_at_fs.o
1326-
#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
1327-
# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
1328-
# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
1329-
ATHENA_SRC = gui.c gui_athena.c gui_x11.c gui_beval.c \
1330-
gui_at_sb.c gui_at_fs.c
1331-
ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
1332-
objects/gui_beval.o \
1333-
objects/gui_at_sb.o objects/gui_at_fs.o
1334-
ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
1335-
1336-
ATHENA_IPATH = $(GUI_INC_LOC)
1337-
ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
1338-
ATHENA_LIBS1 = $(XAW_LIB)
1339-
ATHENA_LIBS2 = -lXt
1340-
ATHENA_INSTALL = install_normal install_gui_extra
1341-
ATHENA_TARGETS = installglinks
1342-
ATHENA_MAN_TARGETS = yes
1343-
ATHENA_TESTTARGET = gui
1344-
ATHENA_BUNDLE =
1345-
13461307
### neXtaw GUI
13471308
NEXTAW_LIB = -lneXtaw
13481309

@@ -2240,7 +2201,7 @@ os_vms.pro: os_vms.c
22402201
# must use os_vms_conf.h for auto/config.h
22412202
mv auto/config.h auto/config.h.save
22422203
cp os_vms_conf.h auto/config.h
2243-
$(CPROTO) -DVMS -UFEAT_GUI_ATHENA -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
2204+
$(CPROTO) -DVMS -UFEAT_GUI_NEXTAW -UFEAT_GUI_MOTIF -UFEAT_GUI_GTK $< > proto/$@
22442205
echo "/* vim: set ft=c : */" >> proto/$@
22452206
rm auto/config.h
22462207
mv auto/config.h.save auto/config.h
@@ -2258,7 +2219,7 @@ notags:
22582219
-rm -f tags
22592220

22602221
# Note: tags is made for the currently configured version, can't include both
2261-
# Motif and Athena GUI
2222+
# Motif and neXtaw GUI
22622223
# You can ignore error messages for missing files.
22632224
tags TAGS: notags
22642225
$(TAGPRG) $(TAGS_FILES)

‎src/auto/configure‎

Lines changed: 19 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,6 @@ enable_gtk2_check
834834
enable_gnome_check
835835
enable_gtk3_check
836836
enable_motif_check
837-
enable_athena_check
838837
enable_nextaw_check
839838
enable_gtktest
840839
with_gnome_includes
@@ -1509,12 +1508,11 @@ Optional Features:
15091508
--disable-farsi Deprecated.
15101509
--enable-xim Include XIM input support.
15111510
--enable-fontset Include X fontset output support.
1512-
--enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/haiku/photon/carbon
1511+
--enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/neXtaw/haiku/photon/carbon
15131512
--enable-gtk2-check If auto-select GUI, check for GTK+ 2 default=yes
15141513
--enable-gnome-check If GTK GUI, check for GNOME default=no
15151514
--enable-gtk3-check If auto-select GUI, check for GTK+ 3 default=yes
15161515
--enable-motif-check If auto-select GUI, check for Motif default=yes
1517-
--enable-athena-check If auto-select GUI, check for Athena default=yes
15181516
--enable-nextaw-check If auto-select GUI, check for neXtaw default=yes
15191517
--disable-gtktest Do not try to compile and run a test GTK program
15201518
--disable-icon-cache-update update disabled
@@ -1523,7 +1521,7 @@ Optional Features:
15231521
--disable-canberra Do not use libcanberra.
15241522
--disable-libsodium Do not use libsodium.
15251523
--disable-acl No check for ACL support.
1526-
--disable-gpm Don't use gpm (Linux mouse daemon).
1524+
--enable-gpm=OPTS Use gpm (Linux mouse daemon). default=yes OPTS=yes/no/dynamic
15271525
--disable-sysmouse Don't use sysmouse (mouse in *BSD console).
15281526
--disable-nls Don't support NLS (gettext()).
15291527
@@ -4787,7 +4785,7 @@ rm -f core conftest.err conftest.$ac_objext \
47874785
OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
47884786
CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"
47894787

4790-
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
4788+
if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
47914789
with_x=no
47924790
fi
47934791
fi
@@ -9274,7 +9272,6 @@ SKIP_GTK2=YES
92749272
SKIP_GTK3=YES
92759273
SKIP_GNOME=YES
92769274
SKIP_MOTIF=YES
9277-
SKIP_ATHENA=YES
92789275
SKIP_NEXTAW=YES
92799276
SKIP_PHOTON=YES
92809277
SKIP_HAIKU=YES
@@ -9336,7 +9333,6 @@ $as_echo "yes/auto - automatic GUI support" >&6; }
93369333
SKIP_GTK3=
93379334
SKIP_GNOME=
93389335
SKIP_MOTIF=
9339-
SKIP_ATHENA=
93409336
SKIP_NEXTAW=;;
93419337
gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5
93429338
$as_echo "GTK+ 2.x GUI support" >&6; }
@@ -9351,9 +9347,6 @@ $as_echo "GTK+ 3.x GUI support" >&6; }
93519347
motif) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5
93529348
$as_echo "Motif GUI support" >&6; }
93539349
SKIP_MOTIF=;;
9354-
athena) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Athena GUI support" >&5
9355-
$as_echo "Athena GUI support" >&6; }
9356-
SKIP_ATHENA=;;
93579350
nextaw) { $as_echo "$as_me:${as_lineno-$LINENO}: result: neXtaw GUI support" >&5
93589351
$as_echo "neXtaw GUI support" >&6; }
93599352
SKIP_NEXTAW=;;
@@ -9433,23 +9426,6 @@ $as_echo "$enable_motif_check" >&6; }
94339426
fi
94349427
fi
94359428

9436-
if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
9437-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Athena" >&5
9438-
$as_echo_n "checking whether or not to look for Athena... " >&6; }
9439-
# Check whether --enable-athena-check was given.
9440-
if test "${enable_athena_check+set}" = set; then :
9441-
enableval=$enable_athena_check;
9442-
else
9443-
enable_athena_check="yes"
9444-
fi
9445-
9446-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_athena_check" >&5
9447-
$as_echo "$enable_athena_check" >&6; }
9448-
if test "x$enable_athena_check" = "xno"; then
9449-
SKIP_ATHENA=YES
9450-
fi
9451-
fi
9452-
94539429
if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
94549430
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for neXtaw" >&5
94559431
$as_echo_n "checking whether or not to look for neXtaw... " >&6; }
@@ -9735,7 +9711,6 @@ $as_echo "no" >&6; }
97359711

97369712
if test "x$GTK_CFLAGS" != "x"; then
97379713
SKIP_GTK3=YES
9738-
SKIP_ATHENA=YES
97399714
SKIP_NEXTAW=YES
97409715
SKIP_MOTIF=YES
97419716
GUITYPE=GTK
@@ -9995,7 +9970,6 @@ $as_echo "no" >&6; }
99959970
if test "x$GTK_CFLAGS" != "x"; then
99969971
SKIP_GTK2=YES
99979972
SKIP_GNOME=YES
9998-
SKIP_ATHENA=YES
99999973
SKIP_NEXTAW=YES
100009974
SKIP_MOTIF=YES
100019975
GUITYPE=GTK
@@ -10302,48 +10276,11 @@ $as_echo "<not found>" >&6; }
1030210276
fi
1030310277

1030410278
if test -z "$SKIP_MOTIF"; then
10305-
SKIP_ATHENA=YES
1030610279
SKIP_NEXTAW=YES
1030710280
GUITYPE=MOTIF
1030810281

1030910282
fi
1031010283

10311-
10312-
GUI_X_LIBS=
10313-
10314-
if test -z "$SKIP_ATHENA"; then
10315-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Athena header files can be found" >&5
10316-
$as_echo_n "checking if Athena header files can be found... " >&6; }
10317-
cflags_save=$CFLAGS
10318-
CFLAGS="$CFLAGS $X_CFLAGS"
10319-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10320-
/* end confdefs.h. */
10321-
10322-
#include <X11/Intrinsic.h>
10323-
#include <X11/Xaw/Paned.h>
10324-
int
10325-
main ()
10326-
{
10327-
10328-
;
10329-
return 0;
10330-
}
10331-
_ACEOF
10332-
if ac_fn_c_try_compile "$LINENO"; then :
10333-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10334-
$as_echo "yes" >&6; }
10335-
else
10336-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
10337-
$as_echo "no" >&6; }; SKIP_ATHENA=YES
10338-
fi
10339-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10340-
CFLAGS=$cflags_save
10341-
fi
10342-
10343-
if test -z "$SKIP_ATHENA"; then
10344-
GUITYPE=ATHENA
10345-
fi
10346-
1034710284
if test -z "$SKIP_NEXTAW"; then
1034810285
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if neXtaw header files can be found" >&5
1034910286
$as_echo_n "checking if neXtaw header files can be found... " >&6; }
@@ -10377,7 +10314,7 @@ if test -z "$SKIP_NEXTAW"; then
1037710314
GUITYPE=NEXTAW
1037810315
fi
1037910316

10380-
if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
10317+
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
1038110318
if test -n "$GUI_INC_LOC"; then
1038210319
GUI_INC_LOC=-I"`echo $GUI_INC_LOC|sed 's%-I%%'`"
1038310320
fi
@@ -10636,7 +10573,7 @@ done
1063610573
fi
1063710574

1063810575

10639-
if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
10576+
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
1064010577
cppflags_save=$CPPFLAGS
1064110578
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
1064210579
for ac_header in X11/xpm.h X11/Sunkeysym.h
@@ -10680,7 +10617,7 @@ $as_echo "X GUI selected; xim has been enabled" >&6; }
1068010617
fi
1068110618
fi
1068210619

10683-
if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
10620+
if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
1068410621
cppflags_save=$CPPFLAGS
1068510622
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
1068610623
{ $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 \
1384513782
LIBS="$ac_save_LIBS"
1384613783
fi
1384713784

13848-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-gpm argument" >&5
13849-
$as_echo_n "checking --disable-gpm argument... " >&6; }
13785+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gpm argument" >&5
13786+
$as_echo_n "checking --enable-gpm argument... " >&6; }
1385013787
# Check whether --enable-gpm was given.
1385113788
if test "${enable_gpm+set}" = set; then :
1385213789
enableval=$enable_gpm;
@@ -13855,9 +13792,9 @@ else
1385513792
fi
1385613793

1385713794

13858-
if test "$enable_gpm" = "yes"; then
13859-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13860-
$as_echo "no" >&6; }
13795+
if test "$enable_gpm" = "yes" -o "$enable_gpm" = "dynamic"; then
13796+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gpm" >&5
13797+
$as_echo "$enable_gpm" >&6; }
1386113798
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5
1386213799
$as_echo_n "checking for gpm... " >&6; }
1386313800
if ${vi_cv_have_gpm+:} false; then :
@@ -13889,13 +13826,18 @@ fi
1388913826
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5
1389013827
$as_echo "$vi_cv_have_gpm" >&6; }
1389113828
if test $vi_cv_have_gpm = yes; then
13892-
LIBS="$LIBS -lgpm"
13829+
if test "$enable_gpm" = "yes"; then
13830+
LIBS="$LIBS -lgpm"
13831+
else
13832+
$as_echo "#define DYNAMIC_GPM 1" >>confdefs.h
13833+
13834+
fi
1389313835
$as_echo "#define HAVE_GPM 1" >>confdefs.h
1389413836

1389513837
fi
1389613838
else
13897-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13898-
$as_echo "yes" >&6; }
13839+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13840+
$as_echo "no" >&6; }
1389913841
fi
1390013842

1390113843
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5

0 commit comments

Comments
 (0)