updated for version 7.0018
diff --git a/src/auto/configure b/src/auto/configure
index 4b03c67..29bb148 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4761,6 +4761,7 @@
&& $PKG_CONFIG --exists gtk+-2.0; then
{
GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+ GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0`
GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4772,6 +4773,7 @@
elif test "X$GTK_CONFIG" != "Xno"; then
{
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBDIR=
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4796,7 +4798,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 4800 "configure"
+#line 4802 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -4828,7 +4830,7 @@
}
EOF
-if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -4850,7 +4852,8 @@
else
echo "$ac_t""found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" 1>&6
fi
- GTK_LIBNAME="$GTK_LIBS"
+ GUI_LIB_LOC="$GTK_LIBDIR"
+ GTK_LIBNAME="$GTK_LIBS"
GUI_INC_LOC="$GTK_CFLAGS"
else
{
@@ -4886,12 +4889,13 @@
{
min_gtk_version=1.1.16
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:4890: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:4893: 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
{
GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+ GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0`
GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4903,6 +4907,7 @@
elif test "X$GTK_CONFIG" != "Xno"; then
{
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBDIR=
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
@@ -4927,7 +4932,7 @@
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 4931 "configure"
+#line 4936 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@@ -4959,7 +4964,7 @@
}
EOF
-if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -5077,7 +5082,7 @@
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:5081: checking for libgnomeui-2.0" >&5
+echo "configure:5086: 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`
@@ -5096,7 +5101,7 @@
# 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:5100: checking for $ac_word" >&5
+echo "configure:5105: 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
@@ -5133,7 +5138,7 @@
no_gnome_config="yes"
else
echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
-echo "configure:5137: checking if $GNOME_CONFIG works" >&5
+echo "configure:5142: 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`"
@@ -5158,7 +5163,7 @@
if test "$no_gnome_config" = "yes"; then
echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:5162: checking for gnomeConf.sh file in $gnome_prefix" >&5
+echo "configure:5167: 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" \
@@ -5196,7 +5201,7 @@
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:5200: checking for location of Motif GUI includes" >&5
+echo "configure:5205: 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
@@ -5220,7 +5225,7 @@
if test -z "$SKIP_MOTIF"; then
echo $ac_n "checking --with-motif-lib argument""... $ac_c" 1>&6
-echo "configure:5224: checking --with-motif-lib argument" >&5
+echo "configure:5229: 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"
@@ -5237,7 +5242,7 @@
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:5241: checking for location of Motif GUI libs" >&5
+echo "configure:5246: 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
@@ -5280,11 +5285,11 @@
if test -z "$SKIP_ATHENA"; then
echo $ac_n "checking if Athena header files can be found""... $ac_c" 1>&6
-echo "configure:5284: checking if Athena header files can be found" >&5
+echo "configure:5289: checking if Athena header files can be found" >&5
cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 5288 "configure"
+#line 5293 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -5293,7 +5298,7 @@
; return 0; }
EOF
-if { (eval echo configure:5297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -5312,11 +5317,11 @@
if test -z "$SKIP_NEXTAW"; then
echo $ac_n "checking if neXtaw header files can be found""... $ac_c" 1>&6
-echo "configure:5316: checking if neXtaw header files can be found" >&5
+echo "configure:5321: checking if neXtaw header files can be found" >&5
cflags_save=$CFLAGS
CFLAGS="$CFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 5320 "configure"
+#line 5325 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -5325,7 +5330,7 @@
; return 0; }
EOF
-if { (eval echo configure:5329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -5353,7 +5358,7 @@
ldflags_save=$LDFLAGS
LDFLAGS="$X_LIBS $LDFLAGS"
echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
-echo "configure:5357: checking for XShapeQueryExtension in -lXext" >&5
+echo "configure:5362: 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
@@ -5361,7 +5366,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5365 "configure"
+#line 5370 "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
@@ -5372,7 +5377,7 @@
XShapeQueryExtension()
; return 0; }
EOF
-if { (eval echo configure:5376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5381: \"$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
@@ -5393,7 +5398,7 @@
fi
echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6
-echo "configure:5397: checking for wslen in -lw" >&5
+echo "configure:5402: 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
@@ -5401,7 +5406,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5405 "configure"
+#line 5410 "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
@@ -5412,7 +5417,7 @@
wslen()
; return 0; }
EOF
-if { (eval echo configure:5416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5421: \"$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
@@ -5433,7 +5438,7 @@
fi
echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
-echo "configure:5437: checking for dlsym in -ldl" >&5
+echo "configure:5442: 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
@@ -5441,7 +5446,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5445 "configure"
+#line 5450 "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
@@ -5452,7 +5457,7 @@
dlsym()
; return 0; }
EOF
-if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5461: \"$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
@@ -5473,7 +5478,7 @@
fi
echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6
-echo "configure:5477: checking for XmuCreateStippledPixmap in -lXmu" >&5
+echo "configure:5482: 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
@@ -5481,7 +5486,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5485 "configure"
+#line 5490 "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
@@ -5492,7 +5497,7 @@
XmuCreateStippledPixmap()
; return 0; }
EOF
-if { (eval echo configure:5496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5501: \"$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
@@ -5514,7 +5519,7 @@
if test -z "$SKIP_MOTIF"; then
echo $ac_n "checking for XpEndJob in -lXp""... $ac_c" 1>&6
-echo "configure:5518: checking for XpEndJob in -lXp" >&5
+echo "configure:5523: 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
@@ -5522,7 +5527,7 @@
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 5526 "configure"
+#line 5531 "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
@@ -5533,7 +5538,7 @@
XpEndJob()
; return 0; }
EOF
-if { (eval echo configure:5537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5542: \"$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
@@ -5557,7 +5562,7 @@
LDFLAGS=$ldflags_save
echo $ac_n "checking for extra X11 defines""... $ac_c" 1>&6
-echo "configure:5561: checking for extra X11 defines" >&5
+echo "configure:5566: checking for extra X11 defines" >&5
NARROW_PROTO=
rm -fr conftestdir
if mkdir conftestdir; then
@@ -5587,17 +5592,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5591: checking for $ac_hdr" >&5
+echo "configure:5596: 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 5596 "configure"
+#line 5601 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5606: \"$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*
@@ -5634,17 +5639,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5638: checking for $ac_hdr" >&5
+echo "configure:5643: 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 5643 "configure"
+#line 5648 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5653: \"$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*
@@ -5673,9 +5678,9 @@
if test ! "$enable_xim" = "no"; then
echo $ac_n "checking for XIMText in X11/Xlib.h""... $ac_c" 1>&6
-echo "configure:5677: checking for XIMText in X11/Xlib.h" >&5
+echo "configure:5682: checking for XIMText in X11/Xlib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 5679 "configure"
+#line 5684 "configure"
#include "confdefs.h"
#include <X11/Xlib.h>
EOF
@@ -5706,17 +5711,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5710: checking for $ac_hdr" >&5
+echo "configure:5715: 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 5715 "configure"
+#line 5720 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5725: \"$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*
@@ -5752,17 +5757,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5756: checking for $ac_hdr" >&5
+echo "configure:5761: 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 5761 "configure"
+#line 5766 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5771: \"$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*
@@ -5855,17 +5860,17 @@
echo $ac_n "checking quality of toupper""... $ac_c" 1>&6
-echo "configure:5859: checking quality of toupper" >&5
+echo "configure:5864: 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 5864 "configure"
+#line 5869 "configure"
#include "confdefs.h"
#include <ctype.h>
main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
EOF
-if { (eval echo configure:5869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5874: \"$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
@@ -5882,16 +5887,16 @@
echo $ac_n "checking whether __DATE__ and __TIME__ work""... $ac_c" 1>&6
-echo "configure:5886: checking whether __DATE__ and __TIME__ work" >&5
+echo "configure:5891: checking whether __DATE__ and __TIME__ work" >&5
cat > conftest.$ac_ext <<EOF
-#line 5888 "configure"
+#line 5893 "configure"
#include "confdefs.h"
int main() {
printf("(" __DATE__ " " __TIME__ ")");
; return 0; }
EOF
-if { (eval echo configure:5895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5900: \"$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
@@ -5907,17 +5912,17 @@
ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for elf.h""... $ac_c" 1>&6
-echo "configure:5911: checking for elf.h" >&5
+echo "configure:5916: 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 5916 "configure"
+#line 5921 "configure"
#include "confdefs.h"
#include <elf.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5926: \"$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*
@@ -5940,7 +5945,7 @@
if test "$HAS_ELF" = 1; then
echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6
-echo "configure:5944: checking for main in -lelf" >&5
+echo "configure:5949: 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
@@ -5948,14 +5953,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lelf $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 5952 "configure"
+#line 5957 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5964: \"$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
@@ -5989,12 +5994,12 @@
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:5993: checking for $ac_hdr that defines DIR" >&5
+echo "configure:5998: 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 5998 "configure"
+#line 6003 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -6002,7 +6007,7 @@
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:6006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -6027,7 +6032,7 @@
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:6031: checking for opendir in -ldir" >&5
+echo "configure:6036: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6035,7 +6040,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6039 "configure"
+#line 6044 "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
@@ -6046,7 +6051,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:6050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6055: \"$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
@@ -6068,7 +6073,7 @@
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:6072: checking for opendir in -lx" >&5
+echo "configure:6077: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6076,7 +6081,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6080 "configure"
+#line 6085 "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
@@ -6087,7 +6092,7 @@
opendir()
; return 0; }
EOF
-if { (eval echo configure:6091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6096: \"$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
@@ -6111,12 +6116,12 @@
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:6115: checking for ANSI C header files" >&5
+echo "configure:6120: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6120 "configure"
+#line 6125 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -6124,7 +6129,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6133: \"$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*
@@ -6141,7 +6146,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 6145 "configure"
+#line 6150 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -6159,7 +6164,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 6163 "configure"
+#line 6168 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -6180,7 +6185,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 6184 "configure"
+#line 6189 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -6191,7 +6196,7 @@
exit (0); }
EOF
-if { (eval echo configure:6195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -6215,12 +6220,12 @@
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:6219: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:6224: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6224 "configure"
+#line 6229 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -6236,7 +6241,7 @@
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:6240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -6259,16 +6264,16 @@
if test $ac_cv_header_sys_wait_h = no; then
echo $ac_n "checking for sys/wait.h that defines union wait""... $ac_c" 1>&6
-echo "configure:6263: checking for sys/wait.h that defines union wait" >&5
+echo "configure:6268: checking for sys/wait.h that defines union wait" >&5
cat > conftest.$ac_ext <<EOF
-#line 6265 "configure"
+#line 6270 "configure"
#include "confdefs.h"
#include <sys/wait.h>
int main() {
union wait xx, yy; xx = yy
; return 0; }
EOF
-if { (eval echo configure:6272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -6299,17 +6304,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6303: checking for $ac_hdr" >&5
+echo "configure:6308: 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 6308 "configure"
+#line 6313 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6318: \"$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*
@@ -6341,17 +6346,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6345: checking for $ac_hdr" >&5
+echo "configure:6350: 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 6350 "configure"
+#line 6355 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6360: \"$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*
@@ -6380,11 +6385,11 @@
fi
echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6
-echo "configure:6384: checking if strings.h can be included after string.h" >&5
+echo "configure:6389: checking if strings.h can be included after string.h" >&5
cppflags_save=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 6388 "configure"
+#line 6393 "configure"
#include "confdefs.h"
#if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO)
@@ -6405,7 +6410,7 @@
int i; i = 0;
; return 0; }
EOF
-if { (eval echo configure:6409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
@@ -6423,13 +6428,13 @@
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:6427: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:6432: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 6433 "configure"
+#line 6438 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -6447,7 +6452,7 @@
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 6451 "configure"
+#line 6456 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -6469,12 +6474,12 @@
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6473: checking for working const" >&5
+echo "configure:6478: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6478 "configure"
+#line 6483 "configure"
#include "confdefs.h"
int main() {
@@ -6523,7 +6528,7 @@
; return 0; }
EOF
-if { (eval echo configure:6527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -6544,12 +6549,12 @@
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6548: checking for mode_t" >&5
+echo "configure:6553: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6553 "configure"
+#line 6558 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6577,12 +6582,12 @@
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6581: checking for off_t" >&5
+echo "configure:6586: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6586 "configure"
+#line 6591 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6610,12 +6615,12 @@
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6614: checking for pid_t" >&5
+echo "configure:6619: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6619 "configure"
+#line 6624 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6643,12 +6648,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:6647: checking for size_t" >&5
+echo "configure:6652: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6652 "configure"
+#line 6657 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6676,12 +6681,12 @@
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6680: checking for uid_t in sys/types.h" >&5
+echo "configure:6685: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6685 "configure"
+#line 6690 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -6710,12 +6715,12 @@
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:6714: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:6719: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6719 "configure"
+#line 6724 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -6724,7 +6729,7 @@
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:6728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -6745,12 +6750,12 @@
fi
echo $ac_n "checking for ino_t""... $ac_c" 1>&6
-echo "configure:6749: checking for ino_t" >&5
+echo "configure:6754: checking for ino_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6754 "configure"
+#line 6759 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6778,12 +6783,12 @@
fi
echo $ac_n "checking for dev_t""... $ac_c" 1>&6
-echo "configure:6782: checking for dev_t" >&5
+echo "configure:6787: checking for dev_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6787 "configure"
+#line 6792 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -6812,12 +6817,12 @@
echo $ac_n "checking for rlim_t""... $ac_c" 1>&6
-echo "configure:6816: checking for rlim_t" >&5
+echo "configure:6821: checking for rlim_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then
echo "$ac_t""(cached) $ac_cv_type_rlim_t" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6821 "configure"
+#line 6826 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6849,12 +6854,12 @@
fi
echo $ac_n "checking for stack_t""... $ac_c" 1>&6
-echo "configure:6853: checking for stack_t" >&5
+echo "configure:6858: checking for stack_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then
echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6858 "configure"
+#line 6863 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6884,9 +6889,9 @@
fi
echo $ac_n "checking whether stack_t has an ss_base field""... $ac_c" 1>&6
-echo "configure:6888: checking whether stack_t has an ss_base field" >&5
+echo "configure:6893: checking whether stack_t has an ss_base field" >&5
cat > conftest.$ac_ext <<EOF
-#line 6890 "configure"
+#line 6895 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6901,7 +6906,7 @@
stack_t sigstk; sigstk.ss_base = 0;
; return 0; }
EOF
-if { (eval echo configure:6905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6910: \"$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_SS_BASE 1
@@ -6917,7 +6922,7 @@
olibs="$LIBS"
echo $ac_n "checking --with-tlib argument""... $ac_c" 1>&6
-echo "configure:6921: checking --with-tlib argument" >&5
+echo "configure:6926: checking --with-tlib argument" >&5
# Check whether --with-tlib or --without-tlib was given.
if test "${with_tlib+set}" = set; then
withval="$with_tlib"
@@ -6935,7 +6940,7 @@
esac
for libname in $tlibs; do
echo $ac_n "checking for tgetent in -l${libname}""... $ac_c" 1>&6
-echo "configure:6939: checking for tgetent in -l${libname}" >&5
+echo "configure:6944: checking for tgetent in -l${libname}" >&5
ac_lib_var=`echo ${libname}'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -6943,7 +6948,7 @@
ac_save_LIBS="$LIBS"
LIBS="-l${libname} $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6947 "configure"
+#line 6952 "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
@@ -6954,7 +6959,7 @@
tgetent()
; return 0; }
EOF
-if { (eval echo configure:6958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6963: \"$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
@@ -6986,7 +6991,7 @@
res="FAIL"
else
cat > conftest.$ac_ext <<EOF
-#line 6990 "configure"
+#line 6995 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -6994,7 +6999,7 @@
#endif
main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }
EOF
-if { (eval echo configure:6998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
res="OK"
else
@@ -7016,12 +7021,12 @@
fi
if test "x$olibs" != "x$LIBS"; then
echo $ac_n "checking whether we talk terminfo""... $ac_c" 1>&6
-echo "configure:7020: checking whether we talk terminfo" >&5
+echo "configure:7025: checking whether we talk terminfo" >&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 7025 "configure"
+#line 7030 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -7030,7 +7035,7 @@
main()
{char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
EOF
-if { (eval echo configure:7034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""no -- we are in termcap land" 1>&6
else
@@ -7051,12 +7056,12 @@
if test "x$olibs" != "x$LIBS"; then
echo $ac_n "checking what tgetent() returns for an unknown terminal""... $ac_c" 1>&6
-echo "configure:7055: checking what tgetent() returns for an unknown terminal" >&5
+echo "configure:7060: checking what tgetent() returns for an unknown terminal" >&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 7060 "configure"
+#line 7065 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -7065,7 +7070,7 @@
main()
{char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
EOF
-if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""zero" 1>&6; cat >> confdefs.h <<\EOF
#define TGETENT_ZERO_ERR 0
@@ -7083,9 +7088,9 @@
fi
echo $ac_n "checking whether termcap.h contains ospeed""... $ac_c" 1>&6
-echo "configure:7087: checking whether termcap.h contains ospeed" >&5
+echo "configure:7092: checking whether termcap.h contains ospeed" >&5
cat > conftest.$ac_ext <<EOF
-#line 7089 "configure"
+#line 7094 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -7096,7 +7101,7 @@
ospeed = 20000
; return 0; }
EOF
-if { (eval echo configure:7100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_OSPEED 1
@@ -7108,9 +7113,9 @@
rm -rf conftest*
echo "$ac_t""no" 1>&6
echo $ac_n "checking whether ospeed can be extern""... $ac_c" 1>&6
-echo "configure:7112: checking whether ospeed can be extern" >&5
+echo "configure:7117: checking whether ospeed can be extern" >&5
cat > conftest.$ac_ext <<EOF
-#line 7114 "configure"
+#line 7119 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -7122,7 +7127,7 @@
ospeed = 20000
; return 0; }
EOF
-if { (eval echo configure:7126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define OSPEED_EXTERN 1
@@ -7140,9 +7145,9 @@
rm -f conftest*
echo $ac_n "checking whether termcap.h contains UP, BC and PC""... $ac_c" 1>&6
-echo "configure:7144: checking whether termcap.h contains UP, BC and PC" >&5
+echo "configure:7149: checking whether termcap.h contains UP, BC and PC" >&5
cat > conftest.$ac_ext <<EOF
-#line 7146 "configure"
+#line 7151 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -7153,7 +7158,7 @@
if (UP == 0 && BC == 0) PC = 1
; return 0; }
EOF
-if { (eval echo configure:7157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_UP_BC_PC 1
@@ -7165,9 +7170,9 @@
rm -rf conftest*
echo "$ac_t""no" 1>&6
echo $ac_n "checking whether UP, BC and PC can be extern""... $ac_c" 1>&6
-echo "configure:7169: checking whether UP, BC and PC can be extern" >&5
+echo "configure:7174: checking whether UP, BC and PC can be extern" >&5
cat > conftest.$ac_ext <<EOF
-#line 7171 "configure"
+#line 7176 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -7179,7 +7184,7 @@
if (UP == 0 && BC == 0) PC = 1
; return 0; }
EOF
-if { (eval echo configure:7183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define UP_BC_PC_EXTERN 1
@@ -7197,9 +7202,9 @@
rm -f conftest*
echo $ac_n "checking whether tputs() uses outfuntype""... $ac_c" 1>&6
-echo "configure:7201: checking whether tputs() uses outfuntype" >&5
+echo "configure:7206: checking whether tputs() uses outfuntype" >&5
cat > conftest.$ac_ext <<EOF
-#line 7203 "configure"
+#line 7208 "configure"
#include "confdefs.h"
#ifdef HAVE_TERMCAP_H
@@ -7210,7 +7215,7 @@
extern int xx(); tputs("test", 1, (outfuntype)xx)
; return 0; }
EOF
-if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7219: \"$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_OUTFUNTYPE 1
@@ -7225,9 +7230,9 @@
rm -f conftest*
echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:7229: checking whether sys/select.h and sys/time.h may both be included" >&5
+echo "configure:7234: checking whether sys/select.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 7231 "configure"
+#line 7236 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -7237,7 +7242,7 @@
; return 0; }
EOF
-if { (eval echo configure:7241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -7254,7 +7259,7 @@
echo $ac_n "checking for /dev/ptc""... $ac_c" 1>&6
-echo "configure:7258: checking for /dev/ptc" >&5
+echo "configure:7263: checking for /dev/ptc" >&5
if test -r /dev/ptc; then
cat >> confdefs.h <<\EOF
#define HAVE_DEV_PTC 1
@@ -7266,17 +7271,17 @@
fi
echo $ac_n "checking for SVR4 ptys""... $ac_c" 1>&6
-echo "configure:7270: checking for SVR4 ptys" >&5
+echo "configure:7275: checking for SVR4 ptys" >&5
if test -c /dev/ptmx ; then
cat > conftest.$ac_ext <<EOF
-#line 7273 "configure"
+#line 7278 "configure"
#include "confdefs.h"
int main() {
ptsname(0);grantpt(0);unlockpt(0);
; return 0; }
EOF
-if { (eval echo configure:7280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_SVR4_PTYS 1
@@ -7294,14 +7299,14 @@
fi
echo $ac_n "checking for ptyranges""... $ac_c" 1>&6
-echo "configure:7298: checking for ptyranges" >&5
+echo "configure:7303: checking for ptyranges" >&5
if test -d /dev/ptym ; then
pdir='/dev/ptym'
else
pdir='/dev'
fi
cat > conftest.$ac_ext <<EOF
-#line 7305 "configure"
+#line 7310 "configure"
#include "confdefs.h"
#ifdef M_UNIX
yes;
@@ -7335,13 +7340,13 @@
fi
echo $ac_n "checking default tty permissions/group""... $ac_c" 1>&6
-echo "configure:7339: checking default tty permissions/group" >&5
+echo "configure:7344: checking default tty permissions/group" >&5
rm -f conftest_grp
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 7345 "configure"
+#line 7350 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -7373,7 +7378,7 @@
}
EOF
-if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
if test -f conftest_grp; then
@@ -7404,12 +7409,12 @@
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:7408: checking return type of signal handlers" >&5
+echo "configure:7413: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7413 "configure"
+#line 7418 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -7426,7 +7431,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:7430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -7458,9 +7463,9 @@
fi
echo $ac_n "checking for struct sigcontext""... $ac_c" 1>&6
-echo "configure:7462: checking for struct sigcontext" >&5
+echo "configure:7467: checking for struct sigcontext" >&5
cat > conftest.$ac_ext <<EOF
-#line 7464 "configure"
+#line 7469 "configure"
#include "confdefs.h"
#include <signal.h>
@@ -7474,7 +7479,7 @@
; return 0; }
EOF
-if { (eval echo configure:7478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -7490,12 +7495,12 @@
rm -f conftest*
echo $ac_n "checking getcwd implementation""... $ac_c" 1>&6
-echo "configure:7494: checking getcwd implementation" >&5
+echo "configure:7499: checking getcwd implementation" >&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 7499 "configure"
+#line 7504 "configure"
#include "confdefs.h"
char *dagger[] = { "IFS=pwd", 0 };
@@ -7507,7 +7512,7 @@
return getcwd(buffer, 500) ? 0 : 1;
}
EOF
-if { (eval echo configure:7511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""it is usable" 1>&6
else
@@ -7532,12 +7537,12 @@
strnicmp strpbrk strtol tgetent towlower towupper usleep utime utimes
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7536: checking for $ac_func" >&5
+echo "configure:7541: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 7541 "configure"
+#line 7546 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -7560,7 +7565,7 @@
; return 0; }
EOF
-if { (eval echo configure:7564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -7586,9 +7591,9 @@
echo $ac_n "checking for st_blksize""... $ac_c" 1>&6
-echo "configure:7590: checking for st_blksize" >&5
+echo "configure:7595: checking for st_blksize" >&5
cat > conftest.$ac_ext <<EOF
-#line 7592 "configure"
+#line 7597 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -7600,7 +7605,7 @@
n = (int)st.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7609: \"$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_ST_BLKSIZE 1
@@ -7615,18 +7620,18 @@
rm -f conftest*
echo $ac_n "checking whether stat() ignores a trailing slash""... $ac_c" 1>&6
-echo "configure:7619: checking whether stat() ignores a trailing slash" >&5
+echo "configure:7624: checking whether stat() ignores a trailing slash" >&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 7624 "configure"
+#line 7629 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
main() {struct stat st; exit(stat("configure/", &st) != 0); }
EOF
-if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define STAT_IGNORES_SLASH 1
@@ -7643,11 +7648,11 @@
echo $ac_n "checking for iconv_open()""... $ac_c" 1>&6
-echo "configure:7647: checking for iconv_open()" >&5
+echo "configure:7652: checking for iconv_open()" >&5
save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
cat > conftest.$ac_ext <<EOF
-#line 7651 "configure"
+#line 7656 "configure"
#include "confdefs.h"
#ifdef HAVE_ICONV_H
@@ -7658,7 +7663,7 @@
iconv_open("fr", "to");
; return 0; }
EOF
-if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes; with -liconv" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_ICONV 1
@@ -7670,7 +7675,7 @@
rm -rf conftest*
LIBS="$save_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7674 "configure"
+#line 7679 "configure"
#include "confdefs.h"
#ifdef HAVE_ICONV_H
@@ -7681,7 +7686,7 @@
iconv_open("fr", "to");
; return 0; }
EOF
-if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_ICONV 1
@@ -7699,9 +7704,9 @@
echo $ac_n "checking for nl_langinfo(CODESET)""... $ac_c" 1>&6
-echo "configure:7703: checking for nl_langinfo(CODESET)" >&5
+echo "configure:7708: checking for nl_langinfo(CODESET)" >&5
cat > conftest.$ac_ext <<EOF
-#line 7705 "configure"
+#line 7710 "configure"
#include "confdefs.h"
#ifdef HAVE_LANGINFO_H
@@ -7712,7 +7717,7 @@
char *cs = nl_langinfo(CODESET);
; return 0; }
EOF
-if { (eval echo configure:7716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_NL_LANGINFO_CODESET 1
@@ -7727,7 +7732,7 @@
rm -f conftest*
echo $ac_n "checking --disable-acl argument""... $ac_c" 1>&6
-echo "configure:7731: checking --disable-acl argument" >&5
+echo "configure:7736: checking --disable-acl argument" >&5
# Check whether --enable-acl or --disable-acl was given.
if test "${enable_acl+set}" = set; then
enableval="$enable_acl"
@@ -7739,7 +7744,7 @@
if test "$enable_acl" = "yes"; then
echo "$ac_t""no" 1>&6
echo $ac_n "checking for acl_get_file in -lposix1e""... $ac_c" 1>&6
-echo "configure:7743: checking for acl_get_file in -lposix1e" >&5
+echo "configure:7748: checking for acl_get_file in -lposix1e" >&5
ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7747,7 +7752,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lposix1e $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7751 "configure"
+#line 7756 "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
@@ -7758,7 +7763,7 @@
acl_get_file()
; return 0; }
EOF
-if { (eval echo configure:7762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7767: \"$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
@@ -7777,7 +7782,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6
-echo "configure:7781: checking for acl_get_file in -lacl" >&5
+echo "configure:7786: checking for acl_get_file in -lacl" >&5
ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7785,7 +7790,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lacl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7789 "configure"
+#line 7794 "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
@@ -7796,7 +7801,7 @@
acl_get_file()
; return 0; }
EOF
-if { (eval echo configure:7800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7805: \"$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
@@ -7813,7 +7818,7 @@
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lacl"
echo $ac_n "checking for fgetxattr in -lattr""... $ac_c" 1>&6
-echo "configure:7817: checking for fgetxattr in -lattr" >&5
+echo "configure:7822: checking for fgetxattr in -lattr" >&5
ac_lib_var=`echo attr'_'fgetxattr | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -7821,7 +7826,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lattr $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7825 "configure"
+#line 7830 "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
@@ -7832,7 +7837,7 @@
fgetxattr()
; return 0; }
EOF
-if { (eval echo configure:7836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7841: \"$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
@@ -7860,9 +7865,9 @@
echo $ac_n "checking for POSIX ACL support""... $ac_c" 1>&6
-echo "configure:7864: checking for POSIX ACL support" >&5
+echo "configure:7869: checking for POSIX ACL support" >&5
cat > conftest.$ac_ext <<EOF
-#line 7866 "configure"
+#line 7871 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -7876,7 +7881,7 @@
acl_free(acl);
; return 0; }
EOF
-if { (eval echo configure:7880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_POSIX_ACL 1
@@ -7891,9 +7896,9 @@
rm -f conftest*
echo $ac_n "checking for Solaris ACL support""... $ac_c" 1>&6
-echo "configure:7895: checking for Solaris ACL support" >&5
+echo "configure:7900: checking for Solaris ACL support" >&5
cat > conftest.$ac_ext <<EOF
-#line 7897 "configure"
+#line 7902 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_ACL_H
@@ -7904,7 +7909,7 @@
; return 0; }
EOF
-if { (eval echo configure:7908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_SOLARIS_ACL 1
@@ -7919,9 +7924,9 @@
rm -f conftest*
echo $ac_n "checking for AIX ACL support""... $ac_c" 1>&6
-echo "configure:7923: checking for AIX ACL support" >&5
+echo "configure:7928: checking for AIX ACL support" >&5
cat > conftest.$ac_ext <<EOF
-#line 7925 "configure"
+#line 7930 "configure"
#include "confdefs.h"
#ifdef HAVE_SYS_ACL_H
@@ -7943,7 +7948,7 @@
; return 0; }
EOF
-if { (eval echo configure:7947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_AIX_ACL 1
@@ -7961,7 +7966,7 @@
fi
echo $ac_n "checking --disable-gpm argument""... $ac_c" 1>&6
-echo "configure:7965: checking --disable-gpm argument" >&5
+echo "configure:7970: checking --disable-gpm argument" >&5
# Check whether --enable-gpm or --disable-gpm was given.
if test "${enable_gpm+set}" = set; then
enableval="$enable_gpm"
@@ -7974,13 +7979,13 @@
if test "$enable_gpm" = "yes"; then
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gpm""... $ac_c" 1>&6
-echo "configure:7978: checking for gpm" >&5
+echo "configure:7983: checking for gpm" >&5
if eval "test \"`echo '$''{'vi_cv_have_gpm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
olibs="$LIBS" ; LIBS="-lgpm"
cat > conftest.$ac_ext <<EOF
-#line 7984 "configure"
+#line 7989 "configure"
#include "confdefs.h"
#include <gpm.h>
#include <linux/keyboard.h>
@@ -7988,7 +7993,7 @@
Gpm_GetLibVersion(NULL);
; return 0; }
EOF
-if { (eval echo configure:7992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
vi_cv_have_gpm=yes
else
@@ -8015,12 +8020,12 @@
fi
echo $ac_n "checking for vsnprintf()""... $ac_c" 1>&6
-echo "configure:8019: checking for vsnprintf()" >&5
+echo "configure:8024: checking for vsnprintf()" >&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 8024 "configure"
+#line 8029 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -8041,7 +8046,7 @@
}
EOF
-if { (eval echo configure:8045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8050: \"$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 HAVE_VSNPRINTF 1
@@ -8059,16 +8064,16 @@
echo $ac_n "checking for rename""... $ac_c" 1>&6
-echo "configure:8063: checking for rename" >&5
+echo "configure:8068: checking for rename" >&5
cat > conftest.$ac_ext <<EOF
-#line 8065 "configure"
+#line 8070 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
rename("this", "that")
; return 0; }
EOF
-if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_RENAME 1
@@ -8083,9 +8088,9 @@
rm -f conftest*
echo $ac_n "checking for sysctl""... $ac_c" 1>&6
-echo "configure:8087: checking for sysctl" >&5
+echo "configure:8092: checking for sysctl" >&5
cat > conftest.$ac_ext <<EOF
-#line 8089 "configure"
+#line 8094 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/sysctl.h>
@@ -8100,7 +8105,7 @@
; return 0; }
EOF
-if { (eval echo configure:8104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8109: \"$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_SYSCTL 1
@@ -8115,9 +8120,9 @@
rm -f conftest*
echo $ac_n "checking for sysinfo""... $ac_c" 1>&6
-echo "configure:8119: checking for sysinfo" >&5
+echo "configure:8124: checking for sysinfo" >&5
cat > conftest.$ac_ext <<EOF
-#line 8121 "configure"
+#line 8126 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/sysinfo.h>
@@ -8130,7 +8135,7 @@
; return 0; }
EOF
-if { (eval echo configure:8134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8139: \"$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_SYSINFO 1
@@ -8145,9 +8150,9 @@
rm -f conftest*
echo $ac_n "checking for sysconf""... $ac_c" 1>&6
-echo "configure:8149: checking for sysconf" >&5
+echo "configure:8154: checking for sysconf" >&5
cat > conftest.$ac_ext <<EOF
-#line 8151 "configure"
+#line 8156 "configure"
#include "confdefs.h"
#include <unistd.h>
int main() {
@@ -8156,7 +8161,7 @@
; return 0; }
EOF
-if { (eval echo configure:8160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8165: \"$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_SYSCONF 1
@@ -8172,7 +8177,7 @@
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:8176: checking size of int" >&5
+echo "configure:8181: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8180,7 +8185,7 @@
{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 8184 "configure"
+#line 8189 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -8191,7 +8196,7 @@
exit(0);
}
EOF
-if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -8212,7 +8217,7 @@
echo $ac_n "checking whether memmove/bcopy/memcpy handle overlaps""... $ac_c" 1>&6
-echo "configure:8216: checking whether memmove/bcopy/memcpy handle overlaps" >&5
+echo "configure:8221: checking whether memmove/bcopy/memcpy handle overlaps" >&5
bcopy_test_prog='
main() {
char buf[10];
@@ -8232,11 +8237,11 @@
{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 8236 "configure"
+#line 8241 "configure"
#include "confdefs.h"
#define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog
EOF
-if { (eval echo configure:8240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8245: \"$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 USEMEMMOVE 1
@@ -8250,11 +8255,11 @@
{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 8254 "configure"
+#line 8259 "configure"
#include "confdefs.h"
#define mch_memmove(s,d,l) bcopy(d,s,l) $bcopy_test_prog
EOF
-if { (eval echo configure:8258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8263: \"$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 USEBCOPY 1
@@ -8268,11 +8273,11 @@
{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 8272 "configure"
+#line 8277 "configure"
#include "confdefs.h"
#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog
EOF
-if { (eval echo configure:8276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8281: \"$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 USEMEMCPY 1
@@ -8304,19 +8309,19 @@
CFLAGS="$CFLAGS -I$x_includes"
LDFLAGS="$X_LIBS $LDFLAGS -lX11"
echo $ac_n "checking whether X_LOCALE needed""... $ac_c" 1>&6
-echo "configure:8308: checking whether X_LOCALE needed" >&5
+echo "configure:8313: checking whether X_LOCALE needed" >&5
cat > conftest.$ac_ext <<EOF
-#line 8310 "configure"
+#line 8315 "configure"
#include "confdefs.h"
#include <X11/Xlocale.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:8317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 8320 "configure"
+#line 8325 "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
@@ -8327,7 +8332,7 @@
_Xsetlocale()
; return 0; }
EOF
-if { (eval echo configure:8331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
@@ -8354,7 +8359,7 @@
fi
echo $ac_n "checking for _xpg4_setrunelocale in -lxpg4""... $ac_c" 1>&6
-echo "configure:8358: checking for _xpg4_setrunelocale in -lxpg4" >&5
+echo "configure:8363: checking for _xpg4_setrunelocale in -lxpg4" >&5
ac_lib_var=`echo xpg4'_'_xpg4_setrunelocale | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -8362,7 +8367,7 @@
ac_save_LIBS="$LIBS"
LIBS="-lxpg4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8366 "configure"
+#line 8371 "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
@@ -8373,7 +8378,7 @@
_xpg4_setrunelocale()
; return 0; }
EOF
-if { (eval echo configure:8377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8382: \"$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
@@ -8395,7 +8400,7 @@
echo $ac_n "checking how to create tags""... $ac_c" 1>&6
-echo "configure:8399: checking how to create tags" >&5
+echo "configure:8404: checking how to create tags" >&5
test -f tags && mv tags tags.save
if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
TAGPRG="ctags"
@@ -8412,7 +8417,7 @@
echo "$ac_t""$TAGPRG" 1>&6
echo $ac_n "checking how to run man with a section nr""... $ac_c" 1>&6
-echo "configure:8416: checking how to run man with a section nr" >&5
+echo "configure:8421: checking how to run man with a section nr" >&5
MANDEF="man"
(eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
echo "$ac_t""$MANDEF" 1>&6
@@ -8424,7 +8429,7 @@
fi
echo $ac_n "checking --disable-nls argument""... $ac_c" 1>&6
-echo "configure:8428: checking --disable-nls argument" >&5
+echo "configure:8433: checking --disable-nls argument" >&5
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
enableval="$enable_nls"
@@ -8439,7 +8444,7 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8443: checking for $ac_word" >&5
+echo "configure:8448: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -8466,19 +8471,19 @@
fi
echo $ac_n "checking for NLS""... $ac_c" 1>&6
-echo "configure:8470: checking for NLS" >&5
+echo "configure:8475: checking for NLS" >&5
if test -f po/Makefile; then
have_gettext="no"
if test -n "$MSGFMT"; then
cat > conftest.$ac_ext <<EOF
-#line 8475 "configure"
+#line 8480 "configure"
#include "confdefs.h"
#include <libintl.h>
int main() {
gettext("Test");
; return 0; }
EOF
-if { (eval echo configure:8482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""gettext() works" 1>&6; have_gettext="yes"
else
@@ -8488,14 +8493,14 @@
olibs=$LIBS
LIBS="$LIBS -lintl"
cat > conftest.$ac_ext <<EOF
-#line 8492 "configure"
+#line 8497 "configure"
#include "confdefs.h"
#include <libintl.h>
int main() {
gettext("Test");
; return 0; }
EOF
-if { (eval echo configure:8499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""gettext() works with -lintl" 1>&6; have_gettext="yes"
else
@@ -8521,12 +8526,12 @@
for ac_func in bind_textdomain_codeset
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8525: checking for $ac_func" >&5
+echo "configure:8530: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 8530 "configure"
+#line 8535 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -8549,7 +8554,7 @@
; return 0; }
EOF
-if { (eval echo configure:8553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -8574,9 +8579,9 @@
done
echo $ac_n "checking for _nl_msg_cat_cntr""... $ac_c" 1>&6
-echo "configure:8578: checking for _nl_msg_cat_cntr" >&5
+echo "configure:8583: checking for _nl_msg_cat_cntr" >&5
cat > conftest.$ac_ext <<EOF
-#line 8580 "configure"
+#line 8585 "configure"
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -8584,7 +8589,7 @@
++_nl_msg_cat_cntr;
; return 0; }
EOF
-if { (eval echo configure:8588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_NL_MSG_CAT_CNTR 1
@@ -8607,17 +8612,17 @@
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:8611: checking for dlfcn.h" >&5
+echo "configure:8616: checking for dlfcn.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 8616 "configure"
+#line 8621 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8626: \"$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*
@@ -8638,17 +8643,17 @@
echo "$ac_t""no" 1>&6
ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dl.h""... $ac_c" 1>&6
-echo "configure:8642: checking for dl.h" >&5
+echo "configure:8647: checking for dl.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 8647 "configure"
+#line 8652 "configure"
#include "confdefs.h"
#include <dl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8657: \"$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*
@@ -8677,9 +8682,9 @@
EOF
echo $ac_n "checking for dlopen()""... $ac_c" 1>&6
-echo "configure:8681: checking for dlopen()" >&5
+echo "configure:8686: checking for dlopen()" >&5
cat > conftest.$ac_ext <<EOF
-#line 8683 "configure"
+#line 8688 "configure"
#include "confdefs.h"
int main() {
@@ -8689,7 +8694,7 @@
; return 0; }
EOF
-if { (eval echo configure:8693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6;
cat >> confdefs.h <<\EOF
@@ -8702,11 +8707,11 @@
rm -rf conftest*
echo "$ac_t""no" 1>&6;
echo $ac_n "checking for dlopen() in -ldl""... $ac_c" 1>&6
-echo "configure:8706: checking for dlopen() in -ldl" >&5
+echo "configure:8711: checking for dlopen() in -ldl" >&5
olibs=$LIBS
LIBS="$LIBS -ldl"
cat > conftest.$ac_ext <<EOF
-#line 8710 "configure"
+#line 8715 "configure"
#include "confdefs.h"
int main() {
@@ -8716,7 +8721,7 @@
; return 0; }
EOF
-if { (eval echo configure:8720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6;
cat >> confdefs.h <<\EOF
@@ -8734,9 +8739,9 @@
fi
rm -f conftest*
echo $ac_n "checking for dlsym()""... $ac_c" 1>&6
-echo "configure:8738: checking for dlsym()" >&5
+echo "configure:8743: checking for dlsym()" >&5
cat > conftest.$ac_ext <<EOF
-#line 8740 "configure"
+#line 8745 "configure"
#include "confdefs.h"
int main() {
@@ -8746,7 +8751,7 @@
; return 0; }
EOF
-if { (eval echo configure:8750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6;
cat >> confdefs.h <<\EOF
@@ -8759,11 +8764,11 @@
rm -rf conftest*
echo "$ac_t""no" 1>&6;
echo $ac_n "checking for dlsym() in -ldl""... $ac_c" 1>&6
-echo "configure:8763: checking for dlsym() in -ldl" >&5
+echo "configure:8768: checking for dlsym() in -ldl" >&5
olibs=$LIBS
LIBS="$LIBS -ldl"
cat > conftest.$ac_ext <<EOF
-#line 8767 "configure"
+#line 8772 "configure"
#include "confdefs.h"
int main() {
@@ -8773,7 +8778,7 @@
; return 0; }
EOF
-if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6;
cat >> confdefs.h <<\EOF
@@ -8796,9 +8801,9 @@
EOF
echo $ac_n "checking for shl_load()""... $ac_c" 1>&6
-echo "configure:8800: checking for shl_load()" >&5
+echo "configure:8805: checking for shl_load()" >&5
cat > conftest.$ac_ext <<EOF
-#line 8802 "configure"
+#line 8807 "configure"
#include "confdefs.h"
int main() {
@@ -8808,7 +8813,7 @@
; return 0; }
EOF
-if { (eval echo configure:8812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6;
cat >> confdefs.h <<\EOF
@@ -8821,11 +8826,11 @@
rm -rf conftest*
echo "$ac_t""no" 1>&6;
echo $ac_n "checking for shl_load() in -ldld""... $ac_c" 1>&6
-echo "configure:8825: checking for shl_load() in -ldld" >&5
+echo "configure:8830: checking for shl_load() in -ldld" >&5
olibs=$LIBS
LIBS="$LIBS -ldld"
cat > conftest.$ac_ext <<EOF
-#line 8829 "configure"
+#line 8834 "configure"
#include "confdefs.h"
int main() {
@@ -8835,7 +8840,7 @@
; return 0; }
EOF
-if { (eval echo configure:8839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6;
cat >> confdefs.h <<\EOF
@@ -8857,17 +8862,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8861: checking for $ac_hdr" >&5
+echo "configure:8866: 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 8866 "configure"
+#line 8871 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8876: \"$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*
@@ -8904,7 +8909,7 @@
if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \
&& test "x$GUITYPE" != "xCARBONGUI"; then
echo $ac_n "checking whether we need -framework Carbon""... $ac_c" 1>&6
-echo "configure:8908: checking whether we need -framework Carbon" >&5
+echo "configure:8913: checking whether we need -framework Carbon" >&5
if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \
|| test "x$features" = "xhuge"; then
LIBS="$LIBS -framework Carbon"
diff --git a/src/configure.in b/src/configure.in
index 4b119f3..d1d01ca 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1586,7 +1586,7 @@
dnl try to compile/link a GTK program. this gets used once for GTK 1.1.16.
dnl
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl Test for GTK, and define GTK_CFLAGS, GTK_LIBDIR and GTK_LIBS
dnl
AC_DEFUN(AM_PATH_GTK,
[
@@ -1602,6 +1602,7 @@
dnl But I guess the dependency on pkgconfig.m4 is not wanted or
dnl something like that.
GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+ GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0`
GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
gtk_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
@@ -1613,6 +1614,7 @@
elif test "X$GTK_CONFIG" != "Xno"; then
{
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBDIR=
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
@@ -1854,7 +1856,8 @@
dnl problems (bold fonts, --remote doesn't work).
if test "X$SKIP_GTK2" != "XYES"; then
AM_PATH_GTK(2.2.0,
- [GTK_LIBNAME="$GTK_LIBS"
+ [GUI_LIB_LOC="$GTK_LIBDIR"
+ GTK_LIBNAME="$GTK_LIBS"
GUI_INC_LOC="$GTK_CFLAGS"], )
if test "x$GTK_CFLAGS" != "x"; then
SKIP_ATHENA=YES
diff --git a/src/eval.c b/src/eval.c
index 492feba..1690eab 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -184,8 +184,9 @@
#include "version.h"
/* values for flags: */
-#define VV_COMPAT 1 /* compatible, also used without "v:" */
-#define VV_RO 2 /* read-only */
+#define VV_COMPAT 1 /* compatible, also used without "v:" */
+#define VV_RO 2 /* read-only */
+#define VV_RO_SBX 4 /* read-only in the sandbox*/
struct vimvar
{
@@ -193,7 +194,7 @@
int len; /* length of name */
char_u *val; /* current value (can also be a number!) */
char type; /* VAR_NUMBER or VAR_STRING */
- char flags; /* VV_COMPAT and VV_RO */
+ char flags; /* VV_COMPAT, VV_RO, VV_RO_SBX */
} vimvars[VV_LEN] =
{ /* The order here must match the VV_ defines in vim.h! */
{"count", sizeof("count") - 1, NULL, VAR_NUMBER, VV_COMPAT+VV_RO},
@@ -207,7 +208,7 @@
{"this_session", sizeof("this_session") - 1, NULL, VAR_STRING, VV_COMPAT},
{"version", sizeof("version") - 1, (char_u *)VIM_VERSION_100,
VAR_NUMBER, VV_COMPAT+VV_RO},
- {"lnum", sizeof("lnum") - 1, NULL, VAR_NUMBER, VV_RO},
+ {"lnum", sizeof("lnum") - 1, NULL, VAR_NUMBER, VV_RO_SBX},
{"termresponse", sizeof("termresponse") - 1, NULL, VAR_STRING, VV_RO},
{"fname", sizeof("fname") - 1, NULL, VAR_STRING, VV_RO},
{"lang", sizeof("lang") - 1, NULL, VAR_STRING, VV_RO},
@@ -220,10 +221,10 @@
{"fname_new", sizeof("fname_new") - 1, NULL, VAR_STRING, VV_RO},
{"fname_diff", sizeof("fname_diff") - 1, NULL, VAR_STRING, VV_RO},
{"cmdarg", sizeof("cmdarg") - 1, NULL, VAR_STRING, VV_RO},
- {"foldstart", sizeof("foldstart") - 1, NULL, VAR_NUMBER, VV_RO},
- {"foldend", sizeof("foldend") - 1, NULL, VAR_NUMBER, VV_RO},
- {"folddashes", sizeof("folddashes") - 1, NULL, VAR_STRING, VV_RO},
- {"foldlevel", sizeof("foldlevel") - 1, NULL, VAR_NUMBER, VV_RO},
+ {"foldstart", sizeof("foldstart") - 1, NULL, VAR_NUMBER, VV_RO_SBX},
+ {"foldend", sizeof("foldend") - 1, NULL, VAR_NUMBER, VV_RO_SBX},
+ {"folddashes", sizeof("folddashes") - 1, NULL, VAR_STRING, VV_RO_SBX},
+ {"foldlevel", sizeof("foldlevel") - 1, NULL, VAR_NUMBER, VV_RO_SBX},
{"progname", sizeof("progname") - 1, NULL, VAR_STRING, VV_RO},
{"servername", sizeof("servername") - 1, NULL, VAR_STRING, VV_RO},
{"dying", sizeof("dying") - 1, NULL, VAR_NUMBER, VV_RO},
@@ -254,6 +255,7 @@
static void f_argidx __ARGS((VAR argvars, VAR retvar));
static void f_argv __ARGS((VAR argvars, VAR retvar));
static void f_browse __ARGS((VAR argvars, VAR retvar));
+static void f_browsedir __ARGS((VAR argvars, VAR retvar));
static buf_T *find_buffer __ARGS((VAR avar));
static void f_bufexists __ARGS((VAR argvars, VAR retvar));
static void f_buflisted __ARGS((VAR argvars, VAR retvar));
@@ -288,6 +290,7 @@
static void foldclosed_both __ARGS((VAR argvars, VAR retvar, int end));
static void f_foldlevel __ARGS((VAR argvars, VAR retvar));
static void f_foldtext __ARGS((VAR argvars, VAR retvar));
+static void f_foldtextresult __ARGS((VAR argvars, VAR retvar));
static void f_foreground __ARGS((VAR argvars, VAR retvar));
static void f_getbufvar __ARGS((VAR argvars, VAR retvar));
static void f_getchar __ARGS((VAR argvars, VAR retvar));
@@ -2814,6 +2817,7 @@
{"argidx", 0, 0, f_argidx},
{"argv", 1, 1, f_argv},
{"browse", 4, 4, f_browse},
+ {"browsedir", 2, 2, f_browsedir},
{"bufexists", 1, 1, f_bufexists},
{"buffer_exists", 1, 1, f_bufexists}, /* obsolete */
{"buffer_name", 1, 1, f_bufname}, /* obsolete */
@@ -2848,6 +2852,7 @@
{"foldclosedend", 1, 1, f_foldclosedend},
{"foldlevel", 1, 1, f_foldlevel},
{"foldtext", 0, 0, f_foldtext},
+ {"foldtextresult", 1, 1, f_foldtextresult},
{"foreground", 0, 0, f_foreground},
{"getbufvar", 2, 2, f_getbufvar},
{"getchar", 0, 1, f_getchar},
@@ -3379,7 +3384,33 @@
defname = get_var_string_buf(&argvars[3], buf2);
retvar->var_val.var_string =
- do_browse(save, title, defname, NULL, initdir, NULL, curbuf);
+ do_browse(save ? BROWSE_SAVE : 0,
+ title, defname, NULL, initdir, NULL, curbuf);
+#else
+ retvar->var_val.var_string = NULL;
+#endif
+ retvar->var_type = VAR_STRING;
+}
+
+/*
+ * "browsedir(title, initdir)" function
+ */
+/* ARGSUSED */
+ static void
+f_browsedir(argvars, retvar)
+ VAR argvars;
+ VAR retvar;
+{
+#ifdef FEAT_BROWSE
+ char_u *title;
+ char_u *initdir;
+ char_u buf[NUMBUFLEN];
+
+ title = get_var_string(&argvars[0]);
+ initdir = get_var_string_buf(&argvars[1], buf);
+
+ retvar->var_val.var_string = do_browse(BROWSE_DIR,
+ title, NULL, NULL, initdir, NULL, curbuf);
#else
retvar->var_val.var_string = NULL;
#endif
@@ -4399,6 +4430,39 @@
}
/*
+ * "foldtextresult(lnum)" function
+ */
+/*ARGSUSED*/
+ static void
+f_foldtextresult(argvars, retvar)
+ VAR argvars;
+ VAR retvar;
+{
+#ifdef FEAT_FOLDING
+ linenr_T lnum;
+ char_u *text;
+ char_u buf[51];
+ foldinfo_T foldinfo;
+ int fold_count;
+#endif
+
+ retvar->var_type = VAR_STRING;
+ retvar->var_val.var_string = NULL;
+#ifdef FEAT_FOLDING
+ lnum = get_var_lnum(argvars);
+ fold_count = foldedCount(curwin, lnum, &foldinfo);
+ if (fold_count > 0)
+ {
+ text = get_foldtext(curwin, lnum, lnum + fold_count - 1,
+ &foldinfo, buf);
+ if (text == buf)
+ text = vim_strsave(text);
+ retvar->var_val.var_string = text;
+ }
+#endif
+}
+
+/*
* "foreground()" function
*/
/*ARGSUSED*/
@@ -9035,6 +9099,8 @@
{
if (vimvars[i].flags & VV_RO)
EMSG2(_(e_readonlyvar), name);
+ else if ((vimvars[i].flags & VV_RO_SBX) && sandbox)
+ EMSG2(_(e_readonlysbx), name);
else
{
if (vimvars[i].type == VAR_STRING)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index ee9f1bc..b462e1f 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2026,6 +2026,8 @@
* The name of the current buffer will be changed.
* A new (unlisted) buffer entry needs to be made to hold the old file
* name, which will become the alternate file name.
+ * But don't set the alternate file name if the buffer didn't have a
+ * name.
*/
fname = curbuf->b_ffname;
sfname = curbuf->b_sfname;
@@ -2039,9 +2041,12 @@
return;
}
curbuf->b_flags |= BF_NOTEDITED;
- buf = buflist_new(fname, xfname, curwin->w_cursor.lnum, 0);
- if (buf != NULL && !cmdmod.keepalt)
- curwin->w_alt_fnum = buf->b_fnum;
+ if (xfname != NULL && *xfname != NUL)
+ {
+ buf = buflist_new(fname, xfname, curwin->w_cursor.lnum, 0);
+ if (buf != NULL && !cmdmod.keepalt)
+ curwin->w_alt_fnum = buf->b_fnum;
+ }
vim_free(fname);
vim_free(sfname);
#ifdef FEAT_AUTOCMD
@@ -2105,7 +2110,7 @@
#ifdef FEAT_BROWSE
if (cmdmod.browse)
{
- browse_file = do_browse(TRUE, (char_u *)_("Save As"), ffname,
+ browse_file = do_browse(BROWSE_SAVE, (char_u *)_("Save As"), ffname,
NULL, NULL, NULL, curbuf);
if (browse_file == NULL)
goto theend;
@@ -2609,7 +2614,7 @@
#ifdef FEAT_BROWSE
if (cmdmod.browse)
{
- browse_file = do_browse(FALSE, (char_u *)_("Edit File"), ffname,
+ browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
NULL, NULL, NULL, curbuf);
if (browse_file == NULL)
goto theend;
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 7a3f4ac..af76d734 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -573,7 +573,7 @@
EX(CMD_ounmenu, "ounmenu", ex_menu,
EXTRA|TRLBAR|NOTRLCOM|USECTRLV|CMDWIN),
EX(CMD_print, "print", ex_print,
- RANGE|WHOLEFOLD|COUNT|TRLBAR|CMDWIN),
+ RANGE|WHOLEFOLD|COUNT|TRLBAR|CMDWIN|SBOXOK),
EX(CMD_pclose, "pclose", ex_pclose,
BANG|TRLBAR),
EX(CMD_perl, "perl", ex_perl,
@@ -674,6 +674,8 @@
BANG|RANGE|NOTADR|COUNT|EXTRA|EDITCMD|ARGOPT|TRLBAR),
EX(CMD_sall, "sall", ex_all,
RANGE|NOTADR|COUNT|TRLBAR),
+EX(CMD_sandbox, "sandbox", ex_wrongmodifier,
+ NEEDARG|EXTRA|NOTRLCOM),
EX(CMD_saveas, "saveas", ex_write,
BANG|DFLALL|FILE1|ARGOPT|CMDWIN|TRLBAR),
EX(CMD_sbuffer, "sbuffer", ex_buffer,
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 1e25841..b9919b6 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -779,8 +779,8 @@
{
char_u *fname;
- fname = do_browse(TRUE, (char_u *)_("Save As"), NULL, NULL, NULL,
- NULL, buf);
+ fname = do_browse(BROWSE_SAVE, (char_u *)_("Save As"),
+ NULL, NULL, NULL, NULL, buf);
if (fname != NULL)
{
if (setfname(buf, fname, NULL, TRUE) == OK)
@@ -2011,7 +2011,7 @@
{
char_u *fname = NULL;
- fname = do_browse(FALSE, (char_u *)_("Source Vim script"), eap->arg,
+ fname = do_browse(0, (char_u *)_("Source Vim script"), eap->arg,
NULL, NULL, BROWSE_FILTER_MACROS, NULL);
if (fname != NULL)
{
diff --git a/src/feature.h b/src/feature.h
index 6531efe..928234c 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1042,6 +1042,11 @@
# define MSWIN_FR_BUFSIZE 256
#endif
+#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MOTIF) \
+ || defined(MSWIN_FIND_REPLACE) || defined(FEAT_GUI_KDE)
+# define FIND_REPLACE_DIALOG 1
+#endif
+
/*
* +clientserver Remote control via the remote_send() function
* and the --remote argument
diff --git a/src/fold.c b/src/fold.c
index ceac00b..feb5c91 100644
--- a/src/fold.c
+++ b/src/fold.c
@@ -1903,6 +1903,93 @@
}
}
+/* get_foldtext() {{{2 */
+/*
+ * Return the text for a closed fold at line "lnum", with last line "lnume".
+ * When 'foldtext' isn't set puts the result in "buf[51]". Otherwise the
+ * result is in allocated memory.
+ */
+ char_u *
+get_foldtext(wp, lnum, lnume, foldinfo, buf)
+ win_T *wp;
+ linenr_T lnum, lnume;
+ foldinfo_T *foldinfo;
+ char_u *buf;
+{
+ char_u *text = NULL;
+
+#ifdef FEAT_EVAL
+ if (*wp->w_p_fdt != NUL)
+ {
+ char_u dashes[51];
+ win_T *save_curwin;
+ int level;
+ char_u *p;
+ int len;
+
+ /* Set "v:foldstart" and "v:foldend". */
+ set_vim_var_nr(VV_FOLDSTART, lnum);
+ set_vim_var_nr(VV_FOLDEND, lnume);
+
+ /* Set "v:folddashes" to a string of "level" dashes. */
+ /* Set "v:foldlevel" to "level". */
+ level = foldinfo->fi_level;
+ if (level > 50)
+ level = 50;
+ vim_memset(dashes, '-', (size_t)level);
+ dashes[level] = NUL;
+ set_vim_var_string(VV_FOLDDASHES, dashes, -1);
+ set_vim_var_nr(VV_FOLDLEVEL, (long)level);
+ save_curwin = curwin;
+ curwin = wp;
+ curbuf = wp->w_buffer;
+
+ ++emsg_off;
+ text = eval_to_string_safe(wp->w_p_fdt, NULL);
+ --emsg_off;
+
+ curwin = save_curwin;
+ curbuf = curwin->w_buffer;
+ set_vim_var_string(VV_FOLDDASHES, NULL, -1);
+
+ if (text != NULL)
+ {
+ /* Replace unprintable characters, if there are any. But
+ * replace a TAB with a space. */
+ for (p = text; *p != NUL; ++p)
+ {
+# ifdef FEAT_MBYTE
+ if (has_mbyte && (len = (*mb_ptr2len_check)(p)) > 1)
+ {
+ if (!vim_isprintc((*mb_ptr2char)(p)))
+ break;
+ p += len - 1;
+ }
+ else
+# endif
+ if (*p == TAB)
+ *p = ' ';
+ else if (ptr2cells(p) > 1)
+ break;
+ }
+ if (*p != NUL)
+ {
+ p = transstr(text);
+ vim_free(text);
+ text = p;
+ }
+ }
+ }
+ if (text == NULL)
+#endif
+ {
+ sprintf((char *)buf, _("+--%3ld lines folded "),
+ (long)(lnume - lnum + 1));
+ text = buf;
+ }
+ return text;
+}
+
/* foldtext_cleanup() {{{2 */
/*
* Remove 'foldmarker' and 'commentstring' from "str" (in-place).
diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index ed4e5bc..f4287ec 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1276,9 +1276,9 @@
char_u *initdir,
char_u *filter)
{
- GtkFileSelection *fs; /* shortcut */
- char_u dirbuf[MAXPATHL];
- char_u *p;
+ GtkFileSelection *fs; /* shortcut */
+ char_u dirbuf[MAXPATHL];
+ char_u *p;
# ifdef HAVE_GTK2
title = CONVERT_TO_UTF8(title);
@@ -1348,6 +1348,75 @@
return vim_strsave(p);
}
+/*
+ * Put up a directory selector
+ * Returns the selected name in allocated memory, or NULL for Cancel.
+ * title title for the window
+ * dflt default name
+ * initdir initial directory, NULL for current dir
+ */
+/*ARGSUSED*/
+ char_u *
+gui_mch_browsedir(
+ char_u *title,
+ char_u *initdir)
+{
+# if defined(GTK_FILE_CHOOSER) /* Only in GTK 2.4 and later. */
+ char_u dirbuf[MAXPATHL];
+ char_u *p;
+ GtkWidget *dirdlg; /* file selection dialog */
+ char_u *dirname = NULL;
+
+ title = CONVERT_TO_UTF8(title);
+
+ dirdlg = gtk_file_chooser_dialog_new(
+ (const gchar *)title,
+ GTK_WINDOW(gui.mainwin),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ CONVERT_TO_UTF8_FREE(title);
+
+ /* if our pointer is currently hidden, then we should show it. */
+ gui_mch_mousehide(FALSE);
+
+ /* GTK appears to insist on an absolute path. */
+ if (initdir == NULL || *initdir == NUL
+ || vim_FullName(initdir, dirbuf, MAXPATHL - 10, FALSE) == FAIL)
+ mch_dirname(dirbuf, MAXPATHL - 10);
+
+ /* Always need a trailing slash for a directory.
+ * Also add a dummy file name, so that we get to the directory. */
+ add_pathsep(dirbuf);
+ STRCAT(dirbuf, "@zd(*&1|");
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dirdlg),
+ (const gchar *)dirbuf);
+
+ /* Run the dialog. */
+ if (gtk_dialog_run(GTK_DIALOG(dirdlg)) == GTK_RESPONSE_ACCEPT)
+ dirname = (char_u *)gtk_file_chooser_get_filename(
+ GTK_FILE_CHOOSER(dirdlg));
+ gtk_widget_destroy(dirdlg);
+ if (dirname == NULL)
+ return NULL;
+
+ /* shorten the file name if possible */
+ mch_dirname(dirbuf, MAXPATHL);
+ p = shorten_fname(dirname, dirbuf);
+ if (p == NULL || *p == NUL)
+ p = dirname;
+ p = vim_strsave(p);
+ g_free(dirname);
+ return p;
+
+# else
+ /* For GTK 2.2 and earlier: fall back to ordinary file selector. */
+ return gui_mch_browse(0, title, NULL, NULL, initdir, NULL);
+# endif
+}
+
#endif /* FEAT_BROWSE */
#if (defined(FEAT_GUI_DIALOG) && !defined(HAVE_GTK2)) || defined(PROTO)
@@ -3038,4 +3107,3 @@
}
#endif /* !HAVE_GTK2 */
-
diff --git a/src/misc2.c b/src/misc2.c
index 82b8887..47ff4a4 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3734,7 +3734,7 @@
{
int llevel;
int len;
- char_u *errpt;
+ char *errpt;
/* save the fix part of the path */
ff_search_ctx->ffsc_fix_path = vim_strnsave(path,
@@ -3758,15 +3758,15 @@
ff_expand_buffer[len++] = *wc_part++;
ff_expand_buffer[len++] = *wc_part++;
- llevel = strtol((char *)wc_part, (char **)&errpt, 10);
- if (errpt != wc_part && llevel > 0 && llevel < 255)
+ llevel = strtol((char *)wc_part, &errpt, 10);
+ if ((char_u *)errpt != wc_part && llevel > 0 && llevel < 255)
ff_expand_buffer[len++] = llevel;
- else if (errpt != wc_part && llevel == 0)
+ else if ((char_u *)errpt != wc_part && llevel == 0)
/* restrict is 0 -> remove already added '**' */
len -= 2;
else
ff_expand_buffer[len++] = FF_MAX_STAR_STAR_EXPAND;
- wc_part = errpt;
+ wc_part = (char_u *)errpt;
if (*wc_part != PATHSEP && *wc_part != NUL)
{
EMSG2(_("E343: Invalid path: '**[number]' must be at the end of the path or be followed by '%s'."), PATHSEPSTR);
diff --git a/src/option.c b/src/option.c
index 9ab3344..6c62196 100644
--- a/src/option.c
+++ b/src/option.c
@@ -941,10 +941,10 @@
# ifdef FEAT_EVAL
(char_u *)VAR_WIN, PV_FDT,
{(char_u *)"foldtext()", (char_u *)NULL}
-#else
+# else
(char_u *)NULL, PV_NONE,
{(char_u *)NULL, (char_u *)0L}
-#endif
+# endif
},
#endif
{"formatoptions","fo", P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST,
diff --git a/src/proto/gui_gtk.pro b/src/proto/gui_gtk.pro
index 2ff2205..882587e 100644
--- a/src/proto/gui_gtk.pro
+++ b/src/proto/gui_gtk.pro
@@ -12,6 +12,7 @@
void gui_mch_create_scrollbar __ARGS((scrollbar_T *sb, int orient));
void gui_mch_destroy_scrollbar __ARGS((scrollbar_T *sb));
char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter));
+char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield));
int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield));
void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
diff --git a/src/proto/message.pro b/src/proto/message.pro
index fafb55a..9957b75 100644
--- a/src/proto/message.pro
+++ b/src/proto/message.pro
@@ -12,6 +12,7 @@
char_u *msg_trunc_attr __ARGS((char_u *s, int force, int attr));
char_u *msg_may_trunc __ARGS((int force, char_u *s));
void ex_messages __ARGS((exarg_T *eap));
+void msg_end_prompt __ARGS((void));
void wait_return __ARGS((int redraw));
void set_keep_msg __ARGS((char_u *s));
void msg_start __ARGS((void));
@@ -54,5 +55,5 @@
int vim_dialog_yesno __ARGS((int type, char_u *title, char_u *message, int dflt));
int vim_dialog_yesnocancel __ARGS((int type, char_u *title, char_u *message, int dflt));
int vim_dialog_yesnoallcancel __ARGS((int type, char_u *title, char_u *message, int dflt));
-char_u *do_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter, buf_T *buf));
+char_u *do_browse __ARGS((int flags, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter, buf_T *buf));
/* vim: set ft=c : */
diff --git a/src/regexp.c b/src/regexp.c
index dac34a2..23e31af 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2583,8 +2583,9 @@
}
/*
- * get and return the value of the hex string immediately after the current
- * position. Return -1 for invalid, or 0-255 for valid. Position is updated:
+ * Get and return the value of the hex string at the current position.
+ * Return -1 if there is no valid hex number.
+ * The position is updated:
* blahblah\%x20asdf
* before-^ ^-after
* The parameter controls the maximum number of input characters. This will be
diff --git a/src/screen.c b/src/screen.c
index 6c1d6cc..70f9dd7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2020,9 +2020,8 @@
linenr_T lnume = lnum + fold_count - 1;
int len;
char_u *p;
- char_u *text = NULL;
+ char_u *text;
int fdc;
- int level;
int col;
int txtcol;
int off = (int)(current_ScreenLine - ScreenLines);
@@ -2139,71 +2138,7 @@
/*
* 4. Compose the folded-line string with 'foldtext', if set.
*/
-#ifdef FEAT_EVAL
- if (*wp->w_p_fdt != NUL)
- {
- char_u dashes[51];
- win_T *save_curwin;
-
- /* Set "v:foldstart" and "v:foldend". */
- set_vim_var_nr(VV_FOLDSTART, lnum);
- set_vim_var_nr(VV_FOLDEND, lnume);
-
- /* Set "v:folddashes" to a string of "level" dashes. */
- /* Set "v:foldlevel" to "level". */
- level = foldinfo->fi_level;
- if (level > 50)
- level = 50;
- vim_memset(dashes, '-', (size_t)level);
- dashes[level] = NUL;
- set_vim_var_string(VV_FOLDDASHES, dashes, -1);
- set_vim_var_nr(VV_FOLDLEVEL, (long)level);
- save_curwin = curwin;
- curwin = wp;
- curbuf = wp->w_buffer;
-
- ++emsg_off;
- text = eval_to_string_safe(wp->w_p_fdt, NULL);
- --emsg_off;
-
- curwin = save_curwin;
- curbuf = curwin->w_buffer;
- set_vim_var_string(VV_FOLDDASHES, NULL, -1);
-
- if (text != NULL)
- {
- /* Replace unprintable characters, if there are any. But
- * replace a TAB with a space. */
- for (p = text; *p != NUL; ++p)
- {
-#ifdef FEAT_MBYTE
- if (has_mbyte && (len = (*mb_ptr2len_check)(p)) > 1)
- {
- if (!vim_isprintc((*mb_ptr2char)(p)))
- break;
- p += len - 1;
- }
- else
-#endif
- if (*p == TAB)
- *p = ' ';
- else if (ptr2cells(p) > 1)
- break;
- }
- if (*p != NUL)
- {
- p = transstr(text);
- vim_free(text);
- text = p;
- }
- }
- }
- if (text == NULL)
-#endif
- {
- sprintf((char *)buf, _("+--%3ld lines folded "), fold_count);
- text = buf;
- }
+ text = get_foldtext(wp, lnum, lnume, foldinfo, buf);
txtcol = col; /* remember where text starts */