From 8a0de3bb3f12104449057824beeda46b7b55e862 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Fri, 24 Nov 2000 20:45:14 +0000 Subject: [PATCH] New arg --enable-extra, checks for ./configure options, oher stuff :-) git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@316 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 + acconfig.h | 3 + config.h.in | 3 + configure | 370 +++++++++++++++++++++++++----------------------- configure.in | 6 + files.c | 11 ++ nano.c | 20 ++- po/cat-id-tbl.c | 141 +++++++++--------- po/nano.pot | 142 ++++++++++++------- proto.h | 3 + winio.c | 95 +++++++++++++ 11 files changed, 500 insertions(+), 296 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51efe19b..be53eb48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ CVS code - - Username tab completion code, and cleaned up existing tabcomp code. New functions real_dir_from_tide(), append_slash_if_dir(), username_tab_completion is more than a stub now =-). + - New options --enable-extra. New code in nano.c:version() to + print out various options from ./configure, function do_credits(). - files.c: write_file() - Unsetting modified on temp files bug fixed (Rocco Corsi). diff --git a/acconfig.h b/acconfig.h index e1ede568..38aed84d 100644 --- a/acconfig.h +++ b/acconfig.h @@ -24,5 +24,8 @@ /* Define to use the slang wrappers for curses instead of native curses */ #undef USE_SLANG +/* Define this to enable the extra stuff */ +#undef NANO_EXTRA + /* Define to disable the tab completion code Chris worked so hard on! */ #undef DISABLE_TABCOMP diff --git a/config.h.in b/config.h.in index 36956d5e..e919f2ff 100644 --- a/config.h.in +++ b/config.h.in @@ -76,6 +76,9 @@ /* Define to use the slang wrappers for curses instead of native curses */ #undef USE_SLANG +/* Define this to enable the extra stuff */ +#undef NANO_EXTRA + /* Define to disable the tab completion code Chris worked so hard on! */ #undef DISABLE_TABCOMP diff --git a/configure b/configure index a42f6887..1fda4aac 100755 --- a/configure +++ b/configure @@ -14,6 +14,8 @@ ac_default_prefix=/usr/local ac_help="$ac_help --enable-tiny Disables features for the sake of size (currently disables detailed help and i18n)" +ac_help="$ac_help + --enable-extra Enable extra (optional) functions, including easter eggs" ac_help="$ac_help --disable-tabcomp Disables tab completion code for a smaller binary" ac_help="$ac_help @@ -573,7 +575,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:577: checking for a BSD compatible install" >&5 +echo "configure:579: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -626,7 +628,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:630: checking whether build environment is sane" >&5 +echo "configure:632: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -683,7 +685,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:687: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:689: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -729,7 +731,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:733: checking for working aclocal" >&5 +echo "configure:735: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -742,7 +744,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:746: checking for working autoconf" >&5 +echo "configure:748: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -755,7 +757,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:759: checking for working automake" >&5 +echo "configure:761: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -768,7 +770,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:772: checking for working autoheader" >&5 +echo "configure:774: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -781,7 +783,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:785: checking for working makeinfo" >&5 +echo "configure:787: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -802,7 +804,7 @@ ALL_LINGUAS="es de fr it id fi" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:806: checking for $ac_word" >&5 +echo "configure:808: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -832,7 +834,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:836: checking for $ac_word" >&5 +echo "configure:838: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -883,7 +885,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:887: checking for $ac_word" >&5 +echo "configure:889: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -915,7 +917,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:919: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:921: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -926,12 +928,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 930 "configure" +#line 932 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -957,12 +959,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:961: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:963: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:966: checking whether we are using GNU C" >&5 +echo "configure:968: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -971,7 +973,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -990,7 +992,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:994: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:996: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1022,7 +1024,7 @@ else fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1026: checking for POSIXized ISC" >&5 +echo "configure:1028: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1044,7 +1046,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1048: checking how to run the C preprocessor" >&5 +echo "configure:1050: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1059,13 +1061,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1071: \"$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 : @@ -1076,13 +1078,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1088: \"$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 : @@ -1093,13 +1095,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1105: \"$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 : @@ -1124,12 +1126,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1128: checking for ANSI C header files" >&5 +echo "configure:1130: 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 < #include @@ -1137,7 +1139,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1143: \"$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* @@ -1154,7 +1156,7 @@ rm -f conftest* 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 @@ -1172,7 +1174,7 @@ fi 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 @@ -1193,7 +1195,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1204,7 +1206,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1231,17 +1233,17 @@ for ac_hdr in fcntl.h unistd.h malloc.h termios.h termio.h limits.h getopt.h reg do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1235: checking for $ac_hdr" >&5 +echo "configure:1237: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1247: \"$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* @@ -1280,6 +1282,18 @@ EOF fi +# Check whether --enable-extra or --disable-extra was given. +if test "${enable_extra+set}" = set; then + enableval="$enable_extra" + if test x$enableval = xyes; then + cat >> confdefs.h <<\EOF +#define NANO_EXTRA 1 +EOF + extra_support=yes + fi +fi + + # Check whether --enable-tabcomp or --disable-tabcomp was given. if test "${enable_tabcomp+set}" = set; then enableval="$enable_tabcomp" @@ -1293,7 +1307,7 @@ fi echo $ac_n "checking whether to use slang""... $ac_c" 1>&6 -echo "configure:1297: checking whether to use slang" >&5 +echo "configure:1311: checking whether to use slang" >&5 CURSES_LIB_NAME="" # Check whether --with-slang or --without-slang was given. if test "${with_slang+set}" = set; then @@ -1313,17 +1327,17 @@ if test "${with_slang+set}" = set; then ac_safe=`echo "slcurses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for slcurses.h""... $ac_c" 1>&6 -echo "configure:1317: checking for slcurses.h" >&5 +echo "configure:1331: checking for slcurses.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1341: \"$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* @@ -1340,21 +1354,21 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for SLtt_initialize in -lslang""... $ac_c" 1>&6 -echo "configure:1344: checking for SLtt_initialize in -lslang" >&5 +echo "configure:1358: checking for SLtt_initialize in -lslang" >&5 _libs=$LIBS LIBS="$LIBS -lslang" if test "$cross_compiling" = yes; then echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext < #include int main () { SLtt_initialize (NULL); return 0; } EOF -if { (eval echo configure:1358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1372: \"$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 @@ -1377,7 +1391,7 @@ else # We might need the term library for termlib in ncurses curses termcap terminfo termlib; do echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 -echo "configure:1381: checking for tputs in -l${termlib}" >&5 +echo "configure:1395: checking for tputs in -l${termlib}" >&5 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1385,7 +1399,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${termlib} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1414: \"$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 @@ -1420,20 +1434,20 @@ fi done echo $ac_n "checking for SLtt_initialize in -lslang $tcap""... $ac_c" 1>&6 -echo "configure:1424: checking for SLtt_initialize in -lslang $tcap" >&5 +echo "configure:1438: checking for SLtt_initialize in -lslang $tcap" >&5 LIBS="$LIBS $tcap" if test "$cross_compiling" = yes; then echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext < #include int main () { SLtt_initialize (NULL); return 0; } EOF -if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1451: \"$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 @@ -1455,20 +1469,20 @@ else echo "$ac_t""no" 1>&6 # We might need the math library echo $ac_n "checking for SLtt_initialize in -lslang $tcap -lm""... $ac_c" 1>&6 -echo "configure:1459: checking for SLtt_initialize in -lslang $tcap -lm" >&5 +echo "configure:1473: checking for SLtt_initialize in -lslang $tcap -lm" >&5 LIBS="$LIBS -lm" if test "$cross_compiling" = yes; then echo "configure: warning: *** Can not use slang when cross-compiling" 1>&2 else cat > conftest.$ac_ext < #include int main () { SLtt_initialize (NULL); return 0; } EOF -if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1486: \"$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 @@ -1525,12 +1539,12 @@ fi for ac_func in snprintf vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1529: checking for $ac_func" >&5 +echo "configure:1543: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1571: \"$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 @@ -1632,7 +1646,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1636: checking for $ac_word" >&5 +echo "configure:1650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1667,7 +1681,7 @@ fi min_glib_version=1.2.4 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:1671: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:1685: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -1690,7 +1704,7 @@ echo "configure:1671: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -1766,7 +1780,7 @@ main () } EOF -if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1800,7 +1814,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -1810,7 +1824,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -1857,12 +1871,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1861: checking return type of signal handlers" >&5 +echo "configure:1875: 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 < #include @@ -1879,7 +1893,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1898,12 +1912,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1902: checking for vprintf" >&5 +echo "configure:1916: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1950,12 +1964,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1954: checking for _doprnt" >&5 +echo "configure:1968: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2005,12 +2019,12 @@ fi for ac_func in getopt_long do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2009: checking for $ac_func" >&5 +echo "configure:2023: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2051: \"$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 @@ -2066,17 +2080,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2070: checking for $ac_hdr" >&5 +echo "configure:2084: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2094: \"$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* @@ -2103,7 +2117,7 @@ fi done echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:2107: checking for tgetent in -lncurses" >&5 +echo "configure:2121: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'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 @@ -2111,7 +2125,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2140: \"$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 @@ -2147,7 +2161,7 @@ fi if eval "test x$CURSES_LIB_NAME = x" then echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:2151: checking for tgetent in -lcurses" >&5 +echo "configure:2165: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'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 @@ -2155,7 +2169,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2184: \"$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 @@ -2192,7 +2206,7 @@ fi if eval "test x$CURSES_LIB_NAME = x" then echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:2196: checking for initscr in -lcurses" >&5 +echo "configure:2210: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2200,7 +2214,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2229: \"$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 @@ -2236,7 +2250,7 @@ fi if eval "test x$CURSES_LIB_NAME = x" then echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:2240: checking for tgetent in -ltermcap" >&5 +echo "configure:2254: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'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 @@ -2244,7 +2258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2273: \"$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 @@ -2289,7 +2303,7 @@ fi echo $ac_n "checking for wresize in -l$CURSES_LIB_NAME""... $ac_c" 1>&6 -echo "configure:2293: checking for wresize in -l$CURSES_LIB_NAME" >&5 +echo "configure:2307: checking for wresize in -l$CURSES_LIB_NAME" >&5 ac_lib_var=`echo $CURSES_LIB_NAME'_'wresize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2297,7 +2311,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$CURSES_LIB_NAME $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2326: \"$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 @@ -2356,7 +2370,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2360: checking for $ac_word" >&5 +echo "configure:2374: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2384,12 +2398,12 @@ else fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2388: checking for working const" >&5 +echo "configure:2402: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2459,21 +2473,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2463: checking for inline" >&5 +echo "configure:2477: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2499,12 +2513,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2503: checking for off_t" >&5 +echo "configure:2517: 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 < #if STDC_HEADERS @@ -2532,12 +2546,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2536: checking for size_t" >&5 +echo "configure:2550: 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 < #if STDC_HEADERS @@ -2567,19 +2581,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2571: checking for working alloca.h" >&5 +echo "configure:2585: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2600,12 +2614,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2604: checking for alloca" >&5 +echo "configure:2618: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2665,12 +2679,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2669: checking whether alloca needs Cray hooks" >&5 +echo "configure:2683: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2699: checking for $ac_func" >&5 +echo "configure:2713: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2741: \"$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 @@ -2750,7 +2764,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2754: checking stack direction for C alloca" >&5 +echo "configure:2768: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2758,7 +2772,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2802,17 +2816,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2806: checking for $ac_hdr" >&5 +echo "configure:2820: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2830: \"$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* @@ -2841,12 +2855,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2845: checking for $ac_func" >&5 +echo "configure:2859: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2887: \"$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 @@ -2894,7 +2908,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2898: checking for working mmap" >&5 +echo "configure:2912: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2902,7 +2916,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3073,17 +3087,17 @@ unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3077: checking for $ac_hdr" >&5 +echo "configure:3091: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3101: \"$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* @@ -3113,12 +3127,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3117: checking for $ac_func" >&5 +echo "configure:3131: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3159: \"$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 @@ -3170,12 +3184,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3174: checking for $ac_func" >&5 +echo "configure:3188: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3216: \"$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 @@ -3232,19 +3246,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3236: checking for LC_MESSAGES" >&5 +echo "configure:3250: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3265,7 +3279,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3269: checking whether NLS is requested" >&5 +echo "configure:3283: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3285,7 +3299,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3289: checking whether included gettext is requested" >&5 +echo "configure:3303: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3304,17 +3318,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3308: checking for libintl.h" >&5 +echo "configure:3322: checking for libintl.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3332: \"$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* @@ -3331,19 +3345,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:3335: checking for gettext in libc" >&5 +echo "configure:3349: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -3359,7 +3373,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3363: checking for bindtextdomain in -lintl" >&5 +echo "configure:3377: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3367,7 +3381,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3396: \"$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 @@ -3394,12 +3408,12 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3398: checking for gettext in libintl" >&5 +echo "configure:3412: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3403: checking for gettext in -lintl" >&5 +echo "configure:3417: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3407,7 +3421,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3436: \"$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 @@ -3457,7 +3471,7 @@ EOF # 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:3461: checking for $ac_word" >&5 +echo "configure:3475: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3491,12 +3505,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3495: checking for $ac_func" >&5 +echo "configure:3509: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3537: \"$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 @@ -3546,7 +3560,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3550: checking for $ac_word" >&5 +echo "configure:3564: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3582,7 +3596,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3586: checking for $ac_word" >&5 +echo "configure:3600: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3614,7 +3628,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3645,7 +3659,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:3649: checking whether catgets can be used" >&5 +echo "configure:3663: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -3658,7 +3672,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:3662: checking for main in -li" >&5 +echo "configure:3676: checking for main in -li" >&5 ac_lib_var=`echo i'_'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 @@ -3666,14 +3680,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3691: \"$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 @@ -3701,12 +3715,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3705: checking for catgets" >&5 +echo "configure:3719: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3751,7 +3765,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3755: checking for $ac_word" >&5 +echo "configure:3769: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3787,7 +3801,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3791: checking for $ac_word" >&5 +echo "configure:3805: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3824,7 +3838,7 @@ fi # 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:3828: checking for $ac_word" >&5 +echo "configure:3842: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3859,7 +3873,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3863: checking for $ac_word" >&5 +echo "configure:3877: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3917,7 +3931,7 @@ fi # 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:3921: checking for $ac_word" >&5 +echo "configure:3935: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3951,7 +3965,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3955: checking for $ac_word" >&5 +echo "configure:3969: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3987,7 +4001,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3991: checking for $ac_word" >&5 +echo "configure:4005: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4080,7 +4094,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4084: checking for catalogs to be installed" >&5 +echo "configure:4098: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4108,17 +4122,17 @@ echo "configure:4084: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4112: checking for linux/version.h" >&5 +echo "configure:4126: checking for linux/version.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4136: \"$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* diff --git a/configure.in b/configure.in index 5f19c1a7..2736eeb5 100644 --- a/configure.in +++ b/configure.in @@ -21,6 +21,12 @@ AC_ARG_ENABLE(tiny, AC_DEFINE(NANO_SMALL) tiny_support=yes fi]) +AC_ARG_ENABLE(extra, +[ --enable-extra Enable extra (optional) functions, including easter eggs], +[if test x$enableval = xyes; then + AC_DEFINE(NANO_EXTRA) extra_support=yes + fi]) + AC_ARG_ENABLE(tabcomp, [ --disable-tabcomp Disables tab completion code for a smaller binary], [if test x$enableval != xyes; then diff --git a/files.c b/files.c index 4500248f..1f684525 100644 --- a/files.c +++ b/files.c @@ -455,6 +455,9 @@ int write_file(char *name, int tmp) int do_writeout(int exiting) { int i = 0; +#ifdef NANO_EXTRA + static int did_cred = 0; +#endif answer = mallocstrcpy(answer, filename); @@ -481,6 +484,14 @@ int do_writeout(int exiting) #ifdef DEBUG fprintf(stderr, _("filename is %s"), answer); #endif + +#ifdef NANO_EXTRA + if (exiting && !ISSET(TEMP_OPT) && !strcasecmp(answer, "zzy") && !did_cred) { + do_credits(); + did_cred = 1; + return - 1; + } +#endif if (strcmp(answer, filename)) { struct stat st; if (!stat(answer, &st)) { diff --git a/nano.c b/nano.c index 5d30e3f5..c1c6244c 100644 --- a/nano.c +++ b/nano.c @@ -417,7 +417,25 @@ void version(void) printf(_(" nano version %s by Chris Allegretta (compiled %s, %s)\n"), VERSION, __TIME__, __DATE__); printf(_ - (" Email: nano@nano-editor.org Web: http://www.nano-editor.org\n")); + (" Email: nano@nano-editor.org Web: http://www.nano-editor.org")); + +#if defined(NANO_SMALL) || defined(NANO_EXTRA) || defined(DISABLE_TABCOMP) || defined(USE_SLANG) + printf(_("\n Compiled options:")); +#endif +#ifdef NANO_SMALL + printf(" --enable-tiny"); +#endif +#ifdef NANO_EXTRA + printf(" --enable-extra"); +#endif +#ifdef DISABLE_TABCOMP + printf(" --disable-tabcomp"); +#endif +#ifdef USE_SLANG + printf(" --with-slang"); +#endif + printf("\n"); + } filestruct *make_new_node(filestruct * prevnode) diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 3fb63da4..8c5dc149 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -169,70 +169,81 @@ Usage: nano [option] +LINE \n\ {" -z \t\tEnable suspend\n", 136}, {" +LINE\t\tStart at line number LINE\n", 137}, {" nano version %s by Chris Allegretta (compiled %s, %s)\n", 138}, - {" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n", 139}, - {"Mark Set", 140}, - {"Mark UNset", 141}, - {"check_wrap called with inptr->data=\"%s\"\n", 142}, - {"current->data now = \"%s\"\n", 143}, - {"After, data = \"%s\"\n", 144}, - {"Edit a replacement", 145}, - {"Could not create a temporary filename: %s", 146}, - {"Finished checking spelling", 147}, - {"Spell checking failed", 148}, - {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 149}, - {"Cannot resize top win", 150}, - {"Cannot move top win", 151}, - {"Cannot resize edit win", 152}, - {"Cannot move edit win", 153}, - {"Cannot resize bottom win", 154}, - {"Cannot move bottom win", 155}, - {"Justify Complete", 156}, - {"%s enable/disable", 157}, - {"enabled", 158}, - {"disabled", 159}, - {"Main: set up windows\n", 160}, - {"Main: bottom win\n", 161}, - {"Main: open file\n", 162}, - {"I got Alt-O-%c! (%d)\n", 163}, - {"I got Alt-[-1-%c! (%d)\n", 164}, - {"I got Alt-[-2-%c! (%d)\n", 165}, - {"I got Alt-[-%c! (%d)\n", 166}, - {"I got Alt-%c! (%d)\n", 167}, - {"Case Sensitive Regexp Search%s%s", 168}, - {"Regexp Search%s%s", 169}, - {"Case Sensitive Search%s%s", 170}, - {"Search%s%s", 171}, - {" (to replace)", 172}, - {"Search Cancelled", 173}, - {"\"%s...\" not found", 174}, - {"Search Wrapped", 175}, - {"Replaced %d occurences", 176}, - {"Replaced 1 occurence", 177}, - {"Replace Cancelled", 178}, - {"Replace this instance?", 179}, - {"Replace failed: unknown subexpression!", 180}, - {"Replace with [%s]", 181}, - {"Replace with", 182}, - {"Enter line number", 183}, - {"Aborted", 184}, - {"Come on, be reasonable", 185}, - {"Only %d lines available, skipping to last line", 186}, - {"actual_x_from_start for xplus=%d returned %d\n", 187}, - {"input '%c' (%d)\n", 188}, - {"New Buffer", 189}, - {" File: ...", 190}, - {"Modified", 191}, - {"Moved to (%d, %d) in edit buffer\n", 192}, - {"current->data = \"%s\"\n", 193}, - {"I got \"%s\"\n", 194}, - {"Yes", 195}, - {"All", 196}, - {"No", 197}, - {"do_cursorpos: linepct = %f, bytepct = %f\n", 198}, - {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 199}, - {"Dumping file buffer to stderr...\n", 200}, - {"Dumping cutbuffer to stderr...\n", 201}, - {"Dumping a buffer to stderr...\n", 202}, + {" Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org", 139}, + {"\ +\n\ + Compiled options:", 140}, + {"Mark Set", 141}, + {"Mark UNset", 142}, + {"check_wrap called with inptr->data=\"%s\"\n", 143}, + {"current->data now = \"%s\"\n", 144}, + {"After, data = \"%s\"\n", 145}, + {"Edit a replacement", 146}, + {"Could not create a temporary filename: %s", 147}, + {"Finished checking spelling", 148}, + {"Spell checking failed", 149}, + {"Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? ", 150}, + {"Cannot resize top win", 151}, + {"Cannot move top win", 152}, + {"Cannot resize edit win", 153}, + {"Cannot move edit win", 154}, + {"Cannot resize bottom win", 155}, + {"Cannot move bottom win", 156}, + {"Justify Complete", 157}, + {"%s enable/disable", 158}, + {"enabled", 159}, + {"disabled", 160}, + {"Main: set up windows\n", 161}, + {"Main: bottom win\n", 162}, + {"Main: open file\n", 163}, + {"I got Alt-O-%c! (%d)\n", 164}, + {"I got Alt-[-1-%c! (%d)\n", 165}, + {"I got Alt-[-2-%c! (%d)\n", 166}, + {"I got Alt-[-%c! (%d)\n", 167}, + {"I got Alt-%c! (%d)\n", 168}, + {"Case Sensitive Regexp Search%s%s", 169}, + {"Regexp Search%s%s", 170}, + {"Case Sensitive Search%s%s", 171}, + {"Search%s%s", 172}, + {" (to replace)", 173}, + {"Search Cancelled", 174}, + {"\"%s...\" not found", 175}, + {"Search Wrapped", 176}, + {"Replaced %d occurences", 177}, + {"Replaced 1 occurence", 178}, + {"Replace Cancelled", 179}, + {"Replace this instance?", 180}, + {"Replace failed: unknown subexpression!", 181}, + {"Replace with [%s]", 182}, + {"Replace with", 183}, + {"Enter line number", 184}, + {"Aborted", 185}, + {"Come on, be reasonable", 186}, + {"Only %d lines available, skipping to last line", 187}, + {"actual_x_from_start for xplus=%d returned %d\n", 188}, + {"input '%c' (%d)\n", 189}, + {"New Buffer", 190}, + {" File: ...", 191}, + {"Modified", 192}, + {"Moved to (%d, %d) in edit buffer\n", 193}, + {"current->data = \"%s\"\n", 194}, + {"I got \"%s\"\n", 195}, + {"Yes", 196}, + {"All", 197}, + {"No", 198}, + {"do_cursorpos: linepct = %f, bytepct = %f\n", 199}, + {"line %d of %d (%.0f%%), character %d of %d (%.0f%%)", 200}, + {"Dumping file buffer to stderr...\n", 201}, + {"Dumping cutbuffer to stderr...\n", 202}, + {"Dumping a buffer to stderr...\n", 203}, + {"The nano text editor", 204}, + {"version ", 205}, + {"Brought to you by:", 206}, + {"Special thanks to:", 207}, + {"The Free Software Foundation", 208}, + {"Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses", 209}, + {"and anyone else we forgot...", 210}, + {"Thank you for using nano!\n", 211}, }; -int _msg_tbl_length = 202; +int _msg_tbl_length = 211; diff --git a/po/nano.pot b/po/nano.pot index 662c33a2..33e4ce52 100644 --- a/po/nano.pot +++ b/po/nano.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-11-24 09:04-0500\n" +"POT-Creation-Date: 2000-11-24 15:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgstr "" msgid "File to insert [from ./] " msgstr "" -#: files.c:276 files.c:301 files.c:498 nano.c:1355 +#: files.c:276 files.c:301 files.c:509 nano.c:1373 msgid "Cancelled" msgstr "" @@ -94,20 +94,20 @@ msgstr "" msgid "Wrote %d lines" msgstr "" -#: files.c:477 +#: files.c:480 msgid "File Name to write" msgstr "" -#: files.c:482 +#: files.c:485 #, c-format msgid "filename is %s" msgstr "" -#: files.c:487 +#: files.c:498 msgid "File exists, OVERWRITE ?" msgstr "" -#: files.c:921 +#: files.c:932 msgid "(more)" msgstr "" @@ -384,7 +384,7 @@ msgid "Case Sens" msgstr "" #: global.c:344 global.c:364 global.c:375 global.c:385 global.c:401 -#: global.c:405 global.c:411 winio.c:1025 +#: global.c:405 global.c:411 winio.c:1026 msgid "Cancel" msgstr "" @@ -602,127 +602,133 @@ msgid " nano version %s by Chris Allegretta (compiled %s, %s)\n" msgstr "" #: nano.c:420 -msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org\n" +msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org" msgstr "" -#: nano.c:455 +#: nano.c:423 +msgid "" +"\n" +" Compiled options:" +msgstr "" + +#: nano.c:473 msgid "Mark Set" msgstr "" -#: nano.c:460 +#: nano.c:478 msgid "Mark UNset" msgstr "" -#: nano.c:887 +#: nano.c:905 #, c-format msgid "check_wrap called with inptr->data=\"%s\"\n" msgstr "" -#: nano.c:938 +#: nano.c:956 #, c-format msgid "current->data now = \"%s\"\n" msgstr "" -#: nano.c:991 +#: nano.c:1009 #, c-format msgid "After, data = \"%s\"\n" msgstr "" -#: nano.c:1093 +#: nano.c:1111 msgid "Edit a replacement" msgstr "" -#: nano.c:1304 +#: nano.c:1322 #, c-format msgid "Could not create a temporary filename: %s" msgstr "" -#: nano.c:1320 +#: nano.c:1338 msgid "Finished checking spelling" msgstr "" -#: nano.c:1322 +#: nano.c:1340 msgid "Spell checking failed" msgstr "" -#: nano.c:1342 +#: nano.c:1360 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? " msgstr "" -#: nano.c:1505 +#: nano.c:1523 msgid "Cannot resize top win" msgstr "" -#: nano.c:1507 +#: nano.c:1525 msgid "Cannot move top win" msgstr "" -#: nano.c:1509 +#: nano.c:1527 msgid "Cannot resize edit win" msgstr "" -#: nano.c:1511 +#: nano.c:1529 msgid "Cannot move edit win" msgstr "" -#: nano.c:1513 +#: nano.c:1531 msgid "Cannot resize bottom win" msgstr "" -#: nano.c:1515 +#: nano.c:1533 msgid "Cannot move bottom win" msgstr "" -#: nano.c:1786 +#: nano.c:1804 msgid "Justify Complete" msgstr "" -#: nano.c:1854 +#: nano.c:1872 #, c-format msgid "%s enable/disable" msgstr "" -#: nano.c:1866 +#: nano.c:1884 msgid "enabled" msgstr "" -#: nano.c:1867 +#: nano.c:1885 msgid "disabled" msgstr "" -#: nano.c:2097 +#: nano.c:2115 msgid "Main: set up windows\n" msgstr "" -#: nano.c:2110 +#: nano.c:2128 msgid "Main: bottom win\n" msgstr "" -#: nano.c:2116 +#: nano.c:2134 msgid "Main: open file\n" msgstr "" -#: nano.c:2153 +#: nano.c:2171 #, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "" -#: nano.c:2175 +#: nano.c:2193 #, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "" -#: nano.c:2208 +#: nano.c:2226 #, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "" -#: nano.c:2256 +#: nano.c:2274 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "" -#: nano.c:2282 +#: nano.c:2300 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "" @@ -812,72 +818,104 @@ msgstr "" msgid "Only %d lines available, skipping to last line" msgstr "" -#: winio.c:120 +#: winio.c:121 #, c-format msgid "actual_x_from_start for xplus=%d returned %d\n" msgstr "" -#: winio.c:438 +#: winio.c:439 #, c-format msgid "input '%c' (%d)\n" msgstr "" -#: winio.c:476 +#: winio.c:477 msgid "New Buffer" msgstr "" -#: winio.c:479 +#: winio.c:480 msgid " File: ..." msgstr "" -#: winio.c:487 +#: winio.c:488 msgid "Modified" msgstr "" -#: winio.c:939 +#: winio.c:940 #, c-format msgid "Moved to (%d, %d) in edit buffer\n" msgstr "" -#: winio.c:950 +#: winio.c:951 #, c-format msgid "current->data = \"%s\"\n" msgstr "" -#: winio.c:995 +#: winio.c:996 #, c-format msgid "I got \"%s\"\n" msgstr "" -#: winio.c:1020 +#: winio.c:1021 msgid "Yes" msgstr "" -#: winio.c:1022 +#: winio.c:1023 msgid "All" msgstr "" -#: winio.c:1024 +#: winio.c:1025 msgid "No" msgstr "" -#: winio.c:1161 +#: winio.c:1162 #, c-format msgid "do_cursorpos: linepct = %f, bytepct = %f\n" msgstr "" -#: winio.c:1165 +#: winio.c:1166 msgid "line %d of %d (%.0f%%), character %d of %d (%.0f%%)" msgstr "" -#: winio.c:1293 +#: winio.c:1294 msgid "Dumping file buffer to stderr...\n" msgstr "" -#: winio.c:1295 +#: winio.c:1296 msgid "Dumping cutbuffer to stderr...\n" msgstr "" -#: winio.c:1297 +#: winio.c:1298 msgid "Dumping a buffer to stderr...\n" msgstr "" + +#: winio.c:1339 +msgid "The nano text editor" +msgstr "" + +#: winio.c:1340 +msgid "version " +msgstr "" + +#: winio.c:1341 +msgid "Brought to you by:" +msgstr "" + +#: winio.c:1342 +msgid "Special thanks to:" +msgstr "" + +#: winio.c:1343 +msgid "The Free Software Foundation" +msgstr "" + +#: winio.c:1344 +msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses" +msgstr "" + +#: winio.c:1345 +msgid "and anyone else we forgot..." +msgstr "" + +#: winio.c:1346 +msgid "Thank you for using nano!\n" +msgstr "" diff --git a/proto.h b/proto.h index 2b826388..921505d9 100644 --- a/proto.h +++ b/proto.h @@ -131,6 +131,9 @@ void page_up_center(void); void blank_edit(void); void search_init_globals(void); void replace_abort(void); +#ifdef NANO_EXTRA +void do_credits(void); +#endif int do_writeout_void(void), do_exit(void), do_gotoline_void(void); int do_insertfile(void), do_search(void), page_up(void), page_down(void); diff --git a/winio.c b/winio.c index bdab1952..d950ae98 100644 --- a/winio.c +++ b/winio.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "config.h" #include "proto.h" #include "nano.h" @@ -1327,3 +1328,97 @@ void fix_editbot(void) for (i = 0; (i <= editwinrows - 1) && (editbot->next != NULL) && (editbot != filebot); i++, editbot = editbot->next); } + +#ifdef NANO_EXTRA +#define CREDIT_LEN 43 +void do_credits(void) +{ + int i, j = 0, place = 0, start_x; + char *what; + + char *nanotext = _("The nano text editor"); + char *version = _("version "); + char *brought = _("Brought to you by:"); + char *specialthx = _("Special thanks to:"); + char *fsf = _("The Free Software Foundation"); + char *ncurses = _("Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"); + char *anyonelse = _("and anyone else we forgot..."); + char *thankyou = _("Thank you for using nano!\n"); + + char *credits[CREDIT_LEN] = {nanotext, + version, + VERSION, + "", + brought, + "Chris Allegretta", + "Jordi Mallach", + "Adam Rogoyski", + "Rob Siemborski", + "Rocco Corsi", + "Ken Tyler", + "Sven Guckes", + "Florian König", + "Pauli Virtanen", + "Daniele Medri", + "Clement Laforet", + "Tedi Heriyanto", + "Erik Anderson", + "Big Gaute", + "Joshua Jensen", + "", + specialthx, + "Plattsburgh State University", + "Benet Laboratories", + "Amy Allegretta", + "Linda Young", + "Jeremy Robichaud", + "Richard Kolb II", + fsf, + "Linus Torvalds", + ncurses, + anyonelse, + thankyou, + "", "", "", "", + "(c) 2000 Chris Allegretta", + "", "", "", "", + "www.nano-editor.org" + }; + + curs_set(0); + nodelay(edit, TRUE); + blank_bottombars(); + mvwaddstr(topwin, 0, 0, hblank); + wrefresh(bottomwin); + wrefresh(topwin); + + while (wgetch(edit) == ERR) { + blank_edit(); + for (i = editwinrows / 2 - 1; i >= (editwinrows / 2 - 1 - j); i--) { + mvwaddstr(edit, i * 2, 0, hblank); + + if (place - (editwinrows / 2 - 1 - i) < CREDIT_LEN) + what = credits[place - (editwinrows / 2 - 1 - i)]; + else + what = ""; + + start_x = center_x - strlen(what) / 2 - 1; + mvwaddstr(edit, i * 2, start_x, what); + } + + if (j < editwinrows / 2 - 1) + j++; + + place++; + wrefresh(edit); + sleep(1); + + if (place >= CREDIT_LEN + editwinrows / 2) + break; + } + + nodelay(edit, FALSE); + curs_set(1); + display_main_list(); + total_refresh(); + } +#endif -- 2.39.5