diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 72fc56d..ad4d805 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([SciTECO], [2.2.0], +AC_INIT([SciTECO], [2.3.0], [robin.haberkorn@googlemail.com], [sciteco], [https://github.com/rhaberkorn/sciteco]) @@ -126,7 +126,7 @@ AC_SUBST(DOXYGEN_HAVE_DOT) AC_CHECK_PROG(SCITECO, sciteco, sciteco) # Checks for libraries. -PKG_CHECK_MODULES(LIBGLIB, [glib-2.0 >= 2.44], [ +PKG_CHECK_MODULES(LIBGLIB, [glib-2.0 >= 2.44 gmodule-2.0], [ CFLAGS="$CFLAGS $LIBGLIB_CFLAGS" CXXFLAGS="$CXXFLAGS $LIBGLIB_CFLAGS" LIBS="$LIBS $LIBGLIB_LIBS" @@ -246,20 +246,16 @@ case $INTERFACE in *curses*) case $INTERFACE in ncurses | netbsd-curses) - # The widechar version of ncurses is necessary for Unicode - # support even when not using widechar APIs. - PKG_CHECK_MODULES(NCURSES, [ncursesw], [ - CFLAGS="$CFLAGS $NCURSES_CFLAGS" - CXXFLAGS="$CXXFLAGS $NCURSES_CFLAGS" - LIBS="$LIBS $NCURSES_LIBS" - ], [ - # This should be sufficient to detect non-widechar - # ncurses versions as well, although we could also check - # for an "ncurses" package. - AC_CHECK_LIB(ncurses, initscr, , [ - AC_MSG_ERROR([libncurses missing!]) - ]) - ]) + # This gives precendence to the widechar version of ncurses, + # which is necessary for Unicode support even when not using widechar APIs. + AX_WITH_CURSES + if [[ x$ax_cv_curses_enhanced != xyes -o x$ax_cv_curses_color != xyes ]]; then + AC_MSG_ERROR([X/Open curses compatible library not found!]) + fi + CFLAGS="$CFLAGS $CURSES_CFLAGS" + CXXFLAGS="$CXXFLAGS $CURSES_CFLAGS" + LIBS="$LIBS $CURSES_LIBS" + AC_CHECK_FUNCS([tigetstr]) if [[ x$INTERFACE = xnetbsd-curses ]]; then @@ -348,6 +344,8 @@ case $INTERFACE in ;; esac + # AX_WITH_CURSES defines per-header symbols, but we currently + # demand that CPPFLAGS are set up such, that we can find curses.h anyway. AC_CHECK_HEADERS([curses.h], , [ AC_MSG_ERROR([Curses header missing!]) ]) |