diff options
author | Bram Moolenaar <Bram@vim.org> | 2004-07-03 16:05:59 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2004-07-03 16:05:59 +0000 |
commit | 592e0a2a1dbc542134c3fd88b4cdfa40e258f41b (patch) | |
tree | 40969df9b211be9ffd5523f7a9cc70e445cac973 /src | |
parent | cfbc5ee48e1b582f418f2d92ccbc4c4e84c803e1 (diff) |
updated for version 7.0005
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 11 | ||||
-rwxr-xr-x | src/auto/configure | 628 | ||||
-rw-r--r-- | src/configure.in | 1 | ||||
-rw-r--r-- | src/ex_cmds.c | 4 | ||||
-rw-r--r-- | src/ex_getln.c | 9 | ||||
-rw-r--r-- | src/feature.h | 1 | ||||
-rw-r--r-- | src/gui_mac.c | 205 | ||||
-rw-r--r-- | src/macros.h | 5 | ||||
-rw-r--r-- | src/memline.c | 3 | ||||
-rw-r--r-- | src/move.c | 4 | ||||
-rw-r--r-- | src/option.c | 36 | ||||
-rw-r--r-- | src/proto/screen.pro | 1 | ||||
-rw-r--r-- | src/screen.c | 68 | ||||
-rw-r--r-- | src/structs.h | 12 |
14 files changed, 662 insertions, 326 deletions
diff --git a/src/Makefile b/src/Makefile index e19dabc5b5..e5d9d89a52 100644 --- a/src/Makefile +++ b/src/Makefile @@ -497,7 +497,7 @@ CClink = $(CC) #CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes #CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes -#CFLAGS = -g -O2 -DSTARTUPTIME=\"vimstartup\" -fno-strength-reduce -Wall -Wmissing-prototypes +#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond # allocated memory (and makes every malloc()/free() very slow). @@ -1492,8 +1492,11 @@ config auto/config.mk: auto/configure config.mk.in config.h.in # Use "make reconfig" to rerun configure without cached values. # When config.h changes, most things will be recompiled automatically. -# Use "myself" to make "all" with a possibly changed auto/config.mk. -reconfig: scratch clean config myself +# Invoke $(MAKE) to run config with the empty auto/config.mk. +# Invoke $(MAKE) to build all with the filled auto/config.mk. +reconfig: scratch clean + $(MAKE) -f Makefile config + $(MAKE) -f Makefile all # Run autoconf to produce auto/configure. # Note: @@ -2413,9 +2416,11 @@ objects/gui_kde_widget.o: gui_kde_widget.cc $(KDE_DIR)/bin/dcopidl2cpp --c++-suffix cc --no-stub kvim_iface.kidl $(CCC) -o $@ gui_kde_widget.cc +gui_kde_widget_moc.cc: objects/gui_kde_widget.o objects/gui_kde_widget_moc.o: gui_kde_widget_moc.cc $(CCC) -o $@ gui_kde_widget_moc.cc +kvim_iface_skel.cc: objects/gui_kde_widget.o objects/kvim_iface_skel.o: kvim_iface_skel.cc $(CCC) -o $@ kvim_iface_skel.cc diff --git a/src/auto/configure b/src/auto/configure index e9e5637f24..62171f2c73 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -3727,6 +3727,7 @@ enable_gui_canon=`echo "_$enable_gui" | \ SKIP_GTK=YES SKIP_GTK2=YES SKIP_GNOME=YES +SKIP_KDE=YES SKIP_MOTIF=YES SKIP_ATHENA=YES SKIP_NEXTAW=YES @@ -3810,7 +3811,7 @@ fi if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then echo $ac_n "checking whether or not to look for KDE""... $ac_c" 1>&6 -echo "configure:3814: checking whether or not to look for KDE" >&5 +echo "configure:3815: checking whether or not to look for KDE" >&5 # Check whether --enable-kde-check or --disable-kde-check was given. if test "${enable_kde_check+set}" = set; then enableval="$enable_kde_check" @@ -3827,7 +3828,7 @@ fi if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then echo $ac_n "checking whether or not to look for GTK""... $ac_c" 1>&6 -echo "configure:3831: checking whether or not to look for GTK" >&5 +echo "configure:3832: checking whether or not to look for GTK" >&5 # Check whether --enable-gtk-check or --disable-gtk-check was given. if test "${enable_gtk_check+set}" = set; then enableval="$enable_gtk_check" @@ -3846,7 +3847,7 @@ fi if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \ -a "$enable_gui_canon" != "gnome2"; then echo $ac_n "checking whether or not to look for GTK+ 2""... $ac_c" 1>&6 -echo "configure:3850: checking whether or not to look for GTK+ 2" >&5 +echo "configure:3851: checking whether or not to look for GTK+ 2" >&5 # Check whether --enable-gtk2-check or --disable-gtk2-check was given. if test "${enable_gtk2_check+set}" = set; then enableval="$enable_gtk2_check" @@ -3864,7 +3865,7 @@ fi if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \ -a "$enable_gui_canon" != "gnome2"; then echo $ac_n "checking whether or not to look for GNOME""... $ac_c" 1>&6 -echo "configure:3868: checking whether or not to look for GNOME" >&5 +echo "configure:3869: checking whether or not to look for GNOME" >&5 # Check whether --enable-gnome-check or --disable-gnome-check was given. if test "${enable_gnome_check+set}" = set; then enableval="$enable_gnome_check" @@ -3881,7 +3882,7 @@ fi if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then echo $ac_n "checking whether or not to look for Motif""... $ac_c" 1>&6 -echo "configure:3885: checking whether or not to look for Motif" >&5 +echo "configure:3886: checking whether or not to look for Motif" >&5 # Check whether --enable-motif-check or --disable-motif-check was given. if test "${enable_motif_check+set}" = set; then enableval="$enable_motif_check" @@ -3898,7 +3899,7 @@ fi if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then echo $ac_n "checking whether or not to look for Athena""... $ac_c" 1>&6 -echo "configure:3902: checking whether or not to look for Athena" >&5 +echo "configure:3903: checking whether or not to look for Athena" >&5 # Check whether --enable-athena-check or --disable-athena-check was given. if test "${enable_athena_check+set}" = set; then enableval="$enable_athena_check" @@ -3915,7 +3916,7 @@ fi if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then echo $ac_n "checking whether or not to look for neXtaw""... $ac_c" 1>&6 -echo "configure:3919: checking whether or not to look for neXtaw" >&5 +echo "configure:3920: checking whether or not to look for neXtaw" >&5 # Check whether --enable-nextaw-check or --disable-nextaw-check was given. if test "${enable_nextaw_check+set}" = set; then enableval="$enable_nextaw_check" @@ -3932,7 +3933,7 @@ fi if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then echo $ac_n "checking whether or not to look for Carbon""... $ac_c" 1>&6 -echo "configure:3936: checking whether or not to look for Carbon" >&5 +echo "configure:3937: checking whether or not to look for Carbon" >&5 # Check whether --enable-carbon-check or --disable-carbon-check was given. if test "${enable_carbon_check+set}" = set; then enableval="$enable_carbon_check" @@ -3966,7 +3967,7 @@ if test "x$ROOTQT" = "x"; then # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3970: checking for $ac_word" >&5 +echo "configure:3971: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4036,7 +4037,7 @@ if test "x$QT_INCLUDES" = "x" ; then fi echo $ac_n "checking whether or not to use a KDE Toolbar in KVim""... $ac_c" 1>&6 -echo "configure:4040: checking whether or not to use a KDE Toolbar in KVim" >&5 +echo "configure:4041: checking whether or not to use a KDE Toolbar in KVim" >&5 # Check whether --enable-kde-toolbar or --disable-kde-toolbar was given. if test "${enable_kde_toolbar+set}" = set; then enableval="$enable_kde_toolbar" @@ -4059,7 +4060,7 @@ if test -z "$SKIP_KDE"; then echo $ac_n "checking --disable-rpath argument""... $ac_c" 1>&6 -echo "configure:4063: checking --disable-rpath argument" >&5 +echo "configure:4064: checking --disable-rpath argument" >&5 # Check whether --enable-rpath or --disable-rpath was given. if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" @@ -4075,7 +4076,7 @@ else fi echo $ac_n "checking --with-kde-prefix argument""... $ac_c" 1>&6 -echo "configure:4079: checking --with-kde-prefix argument" >&5 +echo "configure:4080: checking --with-kde-prefix argument" >&5 # Check whether --with-kde-prefix or --without-kde-prefix was given. if test "${with_kde_prefix+set}" = set; then withval="$with_kde_prefix" @@ -4103,7 +4104,7 @@ fi echo $ac_n "checking --disable-kdetest argument""... $ac_c" 1>&6 -echo "configure:4107: checking --disable-kdetest argument" >&5 +echo "configure:4108: checking --disable-kdetest argument" >&5 # Check whether --enable-kdetest or --disable-kdetest was given. if test "${enable_kdetest+set}" = set; then enableval="$enable_kdetest" @@ -4126,7 +4127,7 @@ if test "X$KDE_CONFIG" = "X"; then # Extract the first word of "kde-config", so it can be a program name with args. set dummy kde-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4130: checking for $ac_word" >&5 +echo "configure:4131: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KDE_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4168,7 +4169,7 @@ if test "X$KDE_CONFIG" != "X" ; then if test "X$KDE_CONFIG" != "X"; then min_kde_version=2.0.0 echo $ac_n "checking for KDE version >= $min_kde_version""... $ac_c" 1>&6 -echo "configure:4172: checking for KDE version >= $min_kde_version" >&5 +echo "configure:4173: checking for KDE version >= $min_kde_version" >&5 no_kde="" if test "$KDE_CONFIG" = "no" ; then no_kde=yes @@ -4178,7 +4179,10 @@ echo "configure:4172: checking for KDE version >= $min_kde_version" >&5 KDE_LIBS="$KDE_PREFIX/lib" fi if test "x$KDE_INCLUDES" = "x"; then - KDE_INCLUDES="$KDE_PREFIX/include" + KDE_INCLUDES="$KDE_PREFIX/include" + if test -d "$KDE_INCLUDES/kde"; then + KDE_INCLUDES="$KDE_INCLUDES/kde" + fi fi kde_major_version=`$KDE_CONFIG --version | grep KDE | \ sed 's/KDE:\ //' | sed 's/\([0-9]*\).\([0-9]*.*\)/\1/'` @@ -4198,7 +4202,7 @@ sed 's/KDE:\ //' | sed 's/\([0-9]*\).\([0-9]*.*\)/\2/'` echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)" else cat > conftest.$ac_ext <<EOF -#line 4202 "configure" +#line 4206 "configure" #include "confdefs.h" #include <stdio.h> @@ -4207,7 +4211,7 @@ main() { return 0; } EOF -if { (eval echo configure:4211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4243,7 +4247,7 @@ fi if test "x$KDE_PREFIX" != "x"; then echo $ac_n "checking for QT version $qt_major_version.x""... $ac_c" 1>&6 -echo "configure:4247: checking for QT version $qt_major_version.x" >&5 +echo "configure:4251: checking for QT version $qt_major_version.x" >&5 if test "x$ROOTQT" != "x" ; then GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC" if test $qt_major_version -lt 2; then @@ -4299,7 +4303,7 @@ fi if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then echo $ac_n "checking for Carbon GUI""... $ac_c" 1>&6 -echo "configure:4303: checking for Carbon GUI" >&5 +echo "configure:4307: checking for Carbon GUI" >&5 echo "$ac_t""yes" 1>&6; GUITYPE=CARBONGUI SKIP_GTK=YES; @@ -4324,7 +4328,7 @@ fi if test -z "$SKIP_GTK"; then echo $ac_n "checking --with-gtk-prefix argument""... $ac_c" 1>&6 -echo "configure:4328: checking --with-gtk-prefix argument" >&5 +echo "configure:4332: checking --with-gtk-prefix argument" >&5 # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then withval="$with_gtk_prefix" @@ -4335,7 +4339,7 @@ fi echo $ac_n "checking --with-gtk-exec-prefix argument""... $ac_c" 1>&6 -echo "configure:4339: checking --with-gtk-exec-prefix argument" >&5 +echo "configure:4343: checking --with-gtk-exec-prefix argument" >&5 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. if test "${with_gtk_exec_prefix+set}" = set; then withval="$with_gtk_exec_prefix" @@ -4346,7 +4350,7 @@ fi echo $ac_n "checking --disable-gtktest argument""... $ac_c" 1>&6 -echo "configure:4350: checking --disable-gtktest argument" >&5 +echo "configure:4354: checking --disable-gtktest argument" >&5 # Check whether --enable-gtktest or --disable-gtktest was given. if test "${enable_gtktest+set}" = set; then enableval="$enable_gtktest" @@ -4373,7 +4377,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4377: checking for $ac_word" >&5 +echo "configure:4381: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4410,7 +4414,7 @@ fi # Extract the first word of "gtk12-config", so it can be a program name with args. set dummy gtk12-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4414: checking for $ac_word" >&5 +echo "configure:4418: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4452,7 +4456,7 @@ fi # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4456: checking for $ac_word" >&5 +echo "configure:4460: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4494,7 +4498,7 @@ fi { min_gtk_version=2.2.0 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:4498: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:4502: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ && $PKG_CONFIG --exists gtk+-2.0; then @@ -4535,7 +4539,7 @@ echo "configure:4498: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <<EOF -#line 4539 "configure" +#line 4543 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -4567,7 +4571,7 @@ return 1; } EOF -if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4625,7 +4629,7 @@ fi { min_gtk_version=1.1.16 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:4629: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:4633: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ && $PKG_CONFIG --exists gtk+-2.0; then @@ -4666,7 +4670,7 @@ echo "configure:4629: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext <<EOF -#line 4670 "configure" +#line 4674 "configure" #include "confdefs.h" #include <gtk/gtk.h> @@ -4698,7 +4702,7 @@ return 1; } EOF -if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4816,7 +4820,7 @@ fi if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then { echo $ac_n "checking for libgnomeui-2.0""... $ac_c" 1>&6 -echo "configure:4820: checking for libgnomeui-2.0" >&5 +echo "configure:4824: checking for libgnomeui-2.0" >&5 if $PKG_CONFIG --exists libgnomeui-2.0; then echo "$ac_t""yes" 1>&6 GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` @@ -4835,7 +4839,7 @@ echo "configure:4820: checking for libgnomeui-2.0" >&5 # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4839: checking for $ac_word" >&5 +echo "configure:4843: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4872,7 +4876,7 @@ fi no_gnome_config="yes" else echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 -echo "configure:4876: checking if $GNOME_CONFIG works" >&5 +echo "configure:4880: checking if $GNOME_CONFIG works" >&5 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`" @@ -4897,7 +4901,7 @@ echo "configure:4876: checking if $GNOME_CONFIG works" >&5 if test "$no_gnome_config" = "yes"; then echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 -echo "configure:4901: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo "configure:4905: checking for gnomeConf.sh file in $gnome_prefix" >&5 if test -f $gnome_prefix/gnomeConf.sh; then echo "$ac_t""found" 1>&6 echo "loading gnome configuration from" \ @@ -4935,7 +4939,7 @@ if test -z "$SKIP_MOTIF"; then GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6 -echo "configure:4939: checking for location of Motif GUI includes" >&5 +echo "configure:4943: checking for location of Motif GUI includes" >&5 gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC" GUI_INC_LOC= for try in $gui_includes; do @@ -4959,7 +4963,7 @@ fi if test -z "$SKIP_MOTIF"; then echo $ac_n "checking --with-motif-lib argument""... $ac_c" 1>&6 -echo "configure:4963: checking --with-motif-lib argument" >&5 +echo "configure:4967: checking --with-motif-lib argument" >&5 # Check whether --with-motif-lib or --without-motif-lib was given. if test "${with_motif_lib+set}" = set; then withval="$with_motif_lib" @@ -4976,7 +4980,7 @@ fi GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" echo $ac_n "checking for location of Motif GUI libs""... $ac_c" 1>&6 -echo "configure:4980: checking for location of Motif GUI libs" >&5 +echo "configure:4984: checking for location of Motif GUI libs" >&5 gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do @@ -5019,11 +5023,11 @@ GUI_X_LIBS= if test -z "$SKIP_ATHENA"; then echo $ac_n "checking if Athena header files can be found""... $ac_c" 1>&6 -echo "configure:5023: checking if Athena header files can be found" >&5 +echo "configure:5027: checking if Athena header files can be found" >&5 cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext <<EOF -#line 5027 "configure" +#line 5031 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -5032,7 +5036,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5051,11 +5055,11 @@ fi if test -z "$SKIP_NEXTAW"; then echo $ac_n "checking if neXtaw header files can be found""... $ac_c" 1>&6 -echo "configure:5055: checking if neXtaw header files can be found" >&5 +echo "configure:5059: checking if neXtaw header files can be found" >&5 cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext <<EOF -#line 5059 "configure" +#line 5063 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> @@ -5064,7 +5068,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -5092,7 +5096,7 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then ldflags_save=$LDFLAGS LDFLAGS="$X_LIBS $LDFLAGS" echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6 -echo "configure:5096: checking for XShapeQueryExtension in -lXext" >&5 +echo "configure:5100: checking for XShapeQueryExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5100,7 +5104,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 5104 "configure" +#line 5108 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5111,7 +5115,7 @@ int main() { XShapeQueryExtension() ; return 0; } EOF -if { (eval echo configure:5115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5132,7 +5136,7 @@ else fi echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6 -echo "configure:5136: checking for wslen in -lw" >&5 +echo "configure:5140: checking for wslen in -lw" >&5 ac_lib_var=`echo w'_'wslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5140,7 +5144,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 5144 "configure" +#line 5148 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5151,7 +5155,7 @@ int main() { wslen() ; return 0; } EOF -if { (eval echo configure:5155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5172,7 +5176,7 @@ else fi echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6 -echo "configure:5176: checking for dlsym in -ldl" >&5 +echo "configure:5180: checking for dlsym in -ldl" >&5 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5180,7 +5184,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 5184 "configure" +#line 5188 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5191,7 +5195,7 @@ int main() { dlsym() ; return 0; } EOF -if { (eval echo configure:5195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5212,7 +5216,7 @@ else fi echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6 -echo "configure:5216: checking for XmuCreateStippledPixmap in -lXmu" >&5 +echo "configure:5220: checking for XmuCreateStippledPixmap in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5220,7 +5224,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 5224 "configure" +#line 5228 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5231,7 +5235,7 @@ int main() { XmuCreateStippledPixmap() ; return 0; } EOF -if { (eval echo configure:5235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5253,7 +5257,7 @@ fi if test -z "$SKIP_MOTIF"; then echo $ac_n "checking for XpEndJob in -lXp""... $ac_c" 1>&6 -echo "configure:5257: checking for XpEndJob in -lXp" >&5 +echo "configure:5261: checking for XpEndJob in -lXp" >&5 ac_lib_var=`echo Xp'_'XpEndJob | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5261,7 +5265,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXp $GUI_X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 5265 "configure" +#line 5269 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5272,7 +5276,7 @@ int main() { XpEndJob() ; return 0; } EOF -if { (eval echo configure:5276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5296,7 +5300,7 @@ fi LDFLAGS=$ldflags_save echo $ac_n "checking for extra X11 defines""... $ac_c" 1>&6 -echo "configure:5300: checking for extra X11 defines" >&5 +echo "configure:5304: checking for extra X11 defines" >&5 NARROW_PROTO= rm -fr conftestdir if mkdir conftestdir; then @@ -5326,17 +5330,17 @@ if test "$enable_xsmp" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5330: checking for $ac_hdr" >&5 +echo "configure:5334: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5335 "configure" +#line 5339 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5373,17 +5377,17 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5377: checking for $ac_hdr" >&5 +echo "configure:5381: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5382 "configure" +#line 5386 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5412,9 +5416,9 @@ done if test ! "$enable_xim" = "no"; then echo $ac_n "checking for XIMText in X11/Xlib.h""... $ac_c" 1>&6 -echo "configure:5416: checking for XIMText in X11/Xlib.h" >&5 +echo "configure:5420: checking for XIMText in X11/Xlib.h" >&5 cat > conftest.$ac_ext <<EOF -#line 5418 "configure" +#line 5422 "configure" #include "confdefs.h" #include <X11/Xlib.h> EOF @@ -5445,17 +5449,17 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5449: checking for $ac_hdr" >&5 +echo "configure:5453: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5454 "configure" +#line 5458 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5491,17 +5495,17 @@ if test -z "$SKIP_MOTIF"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5495: checking for $ac_hdr" >&5 +echo "configure:5499: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5500 "configure" +#line 5504 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5594,17 +5598,17 @@ fi echo $ac_n "checking quality of toupper""... $ac_c" 1>&6 -echo "configure:5598: checking quality of toupper" >&5 +echo "configure:5602: checking quality of toupper" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: failed to compile test program" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 5603 "configure" +#line 5607 "configure" #include "confdefs.h" #include <ctype.h> main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); } EOF -if { (eval echo configure:5608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define BROKEN_TOUPPER 1 @@ -5621,16 +5625,16 @@ fi echo $ac_n "checking whether __DATE__ and __TIME__ work""... $ac_c" 1>&6 -echo "configure:5625: checking whether __DATE__ and __TIME__ work" >&5 +echo "configure:5629: checking whether __DATE__ and __TIME__ work" >&5 cat > conftest.$ac_ext <<EOF -#line 5627 "configure" +#line 5631 "configure" #include "confdefs.h" int main() { printf("(" __DATE__ " " __TIME__ ")"); ; return 0; } EOF -if { (eval echo configure:5634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_DATE_TIME 1 @@ -5646,17 +5650,17 @@ rm -f conftest* ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for elf.h""... $ac_c" 1>&6 -echo "configure:5650: checking for elf.h" >&5 +echo "configure:5654: checking for elf.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5655 "configure" +#line 5659 "configure" #include "confdefs.h" #include <elf.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5679,7 +5683,7 @@ fi if test "$HAS_ELF" = 1; then echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 -echo "configure:5683: checking for main in -lelf" >&5 +echo "configure:5687: checking for main in -lelf" >&5 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5687,14 +5691,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <<EOF -#line 5691 "configure" +#line 5695 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5728,12 +5732,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:5732: checking for $ac_hdr that defines DIR" >&5 +echo "configure:5736: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5737 "configure" +#line 5741 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -5741,7 +5745,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:5745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5749: \"$ac_compile\") 1>&5; (eval $ac_compil |