New slang test code (Albert Chin-A-Young)

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@168 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

ChangeLog

@@ -8,6 +8,8 @@ CVS code
 - po/Makefile.in.in:
 	- Patch to handle $DESTDIR (orig by Dan Harnett contributed by
 	  Christian Weisgerber)
+- configure.in:
+	- New slang test code (Albert Chin-A-Young)
 
 nano-0.9.15 - 08/03/2000
 - Changed edit_update call to take arguments TOP, CENTER or BOTTOM.

configure.in

@@ -25,44 +25,47 @@ CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
 [  --with-slang[=DIR]      Use the slang library instead of curses],
 [    case "$with_slang" in
-    yes)
-	AC_MSG_RESULT(yes)
-
-	AC_CHECK_HEADER(slcurses.h,
-	    AC_CHECK_LIB(slang, SLcurses_newwin,
-		[AC_DEFINE(USE_SLANG) slang_support=yes
-		CURSES_LIB="-lslang" CURSES_LIB_NAME=slang]),
-	    AC_MSG_ERROR([
-*** The header file slcurses.h was not found. If you wish to use
-*** slang support this header file is required. Please either
-*** install a version of slang that includes the slcurses.h file or
-*** do not call the configure script with --with-slang
-]))
-	;;
     no)
 	AC_MSG_RESULT(no)
 	;;
     *)
 	AC_MSG_RESULT(yes)
 
-	# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
+	if test "$with_slang" != "yes"; then
-	# alternate readline path
+	    # Add additional search path
-	_ldflags=${LDFLAGS}
+	    LDFLAGS="-L$with_slang/lib $LDFLAGS"
-	_cppflags=${CPPFLAGS}
+	    CPPFLAGS="-I$with_slang/include $CPPFLAGS"
-
+	fi
-	# Add additional search path
-	LDFLAGS="-L$with_slang/lib $LDFLAGS"
-	CPPFLAGS="-I$with_slang/include $CPPFLAGS"
 
 	AC_CHECK_HEADER(slcurses.h,
-	    AC_CHECK_LIB(slang, SLcurses_newwin,
+	    AC_CHECK_LIB(slang, SLcurses_newwin, [
-		[AC_DEFINE(USE_SLANG) slang_support=yes
+		AC_DEFINE(USE_SLANG)
-		CURSES_LIB="-L${with_slang}/lib -lslang"
+		slang_support=yes
-		CURSES_LIB_NAME=slang],
+		if test "$with_slang" != "yes"; then
-		AC_MSG_ERROR([
+		    CURSES_LIB="-L${with_slang}/lib -lslang"
-*** The slang library was not found or the version you have installed
+		else
-*** is incorrect.
+		    CURSES_LIB="-lslang"
-])),
+		fi
+		CURSES_LIB_NAME=slang], [
+	    # OpenBSD needs termcap library
+	    for termlib in ncurses curses termcap terminfo termlib; do
+		AC_CHECK_LIB(${termlib}, tputs, [tcap="$tcap -l$termlib"])
+		[case "$tcap" in
+		    *-l${termlib}*)
+			break
+		    ;;
+		esac]
+	    done
+
+	    AC_CHECK_LIB(slang, SLcurses_initscr, [
+		AC_DEFINE(USE_SLANG)
+		slang_support=yes
+		if test "$with_slang" != "yes"; then
+		    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
+		else
+		    CURSES_LIB="-lslang $tcap"
+		fi
+		CURSES_LIB_NAME=slang], , $tcap)]),
 	    AC_MSG_ERROR([
 *** The header file slcurses.h was not found. If you wish to use
 *** slang support this header file is required. Please either
@@ -70,7 +73,9 @@ AC_ARG_WITH(slang,
 *** do not call the configure script with --with-slang
 ]))
 
-	LDFLAGS=${_ldflags}
+	if test "$with_slang" != "yes"; then
+	    LDFLAGS=${_ldflags}
+	fi
 	;;
     esac], AC_MSG_RESULT(no))
 

po/nano.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-05 12:07-0400\n"
+"POT-Creation-Date: 2000-08-05 18:51-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"