--- nano-2.0.7/configure.ac.bak 2007-12-20 19:53:17.000000000 +0100 +++ nano-2.0.7/configure.ac 2007-12-29 13:48:25.000000000 +0100 @@ -206,7 +206,7 @@ AC_ARG_WITH(slang, AC_CHECK_HEADER(slcurses.h, AC_MSG_CHECKING([for SLutf8_enable in -lslang]) _libs=$LIBS - LIBS="$LIBS -lslang" + LIBS="$LIBS -lslang-2" AC_TRY_RUN([ #include int main(void) @@ -218,11 +218,11 @@ int main(void) AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then - CURSES_LIB="-L${with_slang}/lib -lslang" + CURSES_LIB="-L${with_slang}/lib -lslang-2" else - CURSES_LIB="-lslang" + CURSES_LIB="-lslang-2" fi - CURSES_LIB_NAME=slang], + CURSES_LIB_NAME=slang-2], [AC_MSG_RESULT(no) # We might need the term library @@ -231,7 +231,7 @@ int main(void) test -n "$tcap" && break done - AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap]) + AC_MSG_CHECKING([for SLutf8_enable in -lslang-2 $tcap]) LIBS="$LIBS $tcap" AC_TRY_RUN([ #include @@ -244,15 +244,15 @@ int main(void) AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then - CURSES_LIB="-L${with_slang}/lib -lslang $tcap" + CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap" else - CURSES_LIB="-lslang $tcap" + CURSES_LIB="-lslang-2 $tcap" fi - CURSES_LIB_NAME=slang], + CURSES_LIB_NAME=slang-2], [AC_MSG_RESULT(no) # We might need the math library - AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm]) + AC_MSG_CHECKING([for SLutf8_enable in -lslang-2 $tcap -lm]) LIBS="$LIBS -lm" AC_TRY_RUN([ #include @@ -265,11 +265,11 @@ int main(void) AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then - CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" + CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap -lm" else - CURSES_LIB="-lslang $tcap -lm" + CURSES_LIB="-lslang-2 $tcap -lm" fi - CURSES_LIB_NAME=slang], + CURSES_LIB_NAME=slang-2], [AC_MSG_RESULT(no)], AC_MSG_WARN([*** Can not use slang when cross-compiling]))], AC_MSG_WARN([*** Can not use slang when cross-compiling]))], @@ -288,9 +288,9 @@ int main(void) fi AC_CHECK_HEADER(slcurses.h, - AC_MSG_CHECKING([for SLtt_initialize in -lslang]) + AC_MSG_CHECKING([for SLtt_initialize in -lslang-2]) _libs=$LIBS - LIBS="$LIBS -lslang" + LIBS="$LIBS -lslang-2" AC_TRY_RUN([ #include int main(void) @@ -301,11 +301,11 @@ int main(void) [AC_MSG_RESULT(yes) AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes if test x$with_slang != xyes; then - CURSES_LIB="-L${with_slang}/lib -lslang" + CURSES_LIB="-L${with_slang}/lib -lslang-2" else - CURSES_LIB="-lslang" + CURSES_LIB="-lslang-2" fi - CURSES_LIB_NAME=slang], + CURSES_LIB_NAME=slang-2], [AC_MSG_RESULT(no) # We might need the term library @@ -314,7 +314,7 @@ int main(void) test -n "$tcap" && break done - AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap]) + AC_MSG_CHECKING([for SLtt_initialize in -lslang-2 $tcap]) LIBS="$LIBS $tcap" AC_TRY_RUN([ #include @@ -326,15 +326,15 @@ int main(void) [AC_MSG_RESULT(yes) AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes if test x$with_slang != xyes; then - CURSES_LIB="-L${with_slang}/lib -lslang $tcap" + CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap" else - CURSES_LIB="-lslang $tcap" + CURSES_LIB="-lslang-2 $tcap" fi - CURSES_LIB_NAME=slang], + CURSES_LIB_NAME=slang-2], [AC_MSG_RESULT(no) # We might need the math library - AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm]) + AC_MSG_CHECKING([for SLtt_initialize in -lslang-2 $tcap -lm]) LIBS="$LIBS -lm" AC_TRY_RUN([ #include @@ -346,11 +346,11 @@ int main(void) [AC_MSG_RESULT(yes) AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes if test x$with_slang != xyes; then - CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" + CURSES_LIB="-L${with_slang}/lib -lslang-2 $tcap -lm" else - CURSES_LIB="-lslang $tcap -lm" + CURSES_LIB="-lslang-2 $tcap -lm" fi - CURSES_LIB_NAME=slang], + CURSES_LIB_NAME=slang-2], [AC_MSG_RESULT(no)], AC_MSG_WARN([*** Can not use slang when cross-compiling]))], AC_MSG_WARN([*** Can not use slang when cross-compiling]))], @@ -372,7 +372,7 @@ int main(void) ;; esac], [AC_MSG_RESULT(no)]) -if test x$CURSES_LIB_NAME = xslang; then +if test x$CURSES_LIB_NAME = xslang-2; then AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])