Merge commit 'upstream/1.5'

[ap-utils.git] / configure.in

diff --git a/configure.in b/configure.in
index a106b7dd4e48ee95ed54a01dfc2d96c5c37eab12..0a934f743000bc28e2fa5c997a1677998f3d8023 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@
 #
 AC_INIT([lib/snmp.c])
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(ap-utils, 1.5pre1_FreedomOfUkraine)
+AM_INIT_AUTOMAKE(ap-utils, 1.5)
 AM_CONFIG_HEADER(config.h)
 
 ac_aux_dir=config
@@ -55,10 +55,12 @@ ALL_LINGUAS="uk fr pl ro nl tr"
 
 AM_GNU_GETTEXT
 
-AC_CHECK_LIB(ncurses, initscr, , NOCURSES=yes)
+aputils_save_LIBS="$LIBS"
+AC_CHECK_LIB(ncurses, initscr, CURSESLIBS="-lncurses", NOCURSES=yes)
 if test "$NOCURSES" = yes; then
-       AC_CHECK_LIB(curses, initscr, , AC_MSG_ERROR([ap-utils requires installed ncurses or Sys V curses to build]))
+       AC_CHECK_LIB(curses, initscr, CURSESLIBS="-lcurses", AC_MSG_ERROR([ap-utils requires installed ncurses or Sys V curses to build]))
 fi
+LIBS="$aputils_save_LIBS"
 
 # Check for OS and make OS define OS specific variables
 case "$host_os" in
@@ -106,6 +108,8 @@ no)
  esac     
 ])
 
+AC_SUBST(CURSESLIBS)
+
 AC_OUTPUT([Makefile src/Makefile ap-gl/Makefile lib/Makefile po/Makefile.in intl/Makefile Documentation/Makefile])
 
 echo "