diff --git a/configure.ac b/configure.ac
index 65b5af34c6087d39902c22ecda9a69ac20562c8d..b179389febd36f351cad70e0cd26e313ecc55a16 100644 (file)
--- a/configure.ac
+++ b/configure.ac
-AC_INIT([tig], [0],
- [Jonas Fonseca <fonseca@diku.dk>],
- [tig])
+AC_INIT([tig], [0], [Jonas Fonseca <fonseca@diku.dk>], [tig])
AC_LANG([C])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(tig.c)
AC_LANG([C])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(tig.c)
-AC_SEARCH_LIBS([wclear], [ncursesw ncurses curses], [],
- [AC_ERROR([curses not found])])
+cursed=no
+AC_CHECK_HEADERS([ncursesw/ncurses.h],
+ [AC_SEARCH_LIBS([initscr], [ncursesw], [cursed=yes])])
+case "$cursed" in "no")
+ AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h],
+ [AC_SEARCH_LIBS([wclear], [ncurses], [cursed=yes])])
+
+ case "$cursed" in "no")
+ AC_ERROR([ncurses not found])
+ esac
+
+ AC_MSG_WARN([The found ncurses library does not support wide-char.])
+ AC_MSG_WARN([This means that tig will not correctly render UTF-8.])
+esac
AM_ICONV
AC_PROG_CC
AM_ICONV
AC_PROG_CC
-AC_CHECK_PROGS(GIT_CONFIG, [git-config git-repo-config])
-if test "${ac_cv_prog_GIT_CONFIG}" = ""; then
- AC_CHECK_PROGS(GIT, [git])
- GIT_CONFIG="${ac_cv_prog_GIT} config"
-fi
-AC_DEFINE_UNQUOTED(GIT_CONFIG,"$GIT_CONFIG",[git config program])
+
+AC_CHECK_PROG(GIT, [git], [git], [AC_ERROR([git not found])])
+AC_MSG_CHECKING([which config subcommand git supports])
+GIT_CONFIG="repo-config"
+git config --list >/dev/null && GIT_CONFIG="config"
+AC_MSG_RESULT([$GIT_CONFIG])
+AC_DEFINE_UNQUOTED(GIT_CONFIG,"$GIT_CONFIG",[git config subcommand])
+
AC_CHECK_PROGS(ASCIIDOC, [asciidoc false])
AC_CHECK_PROGS(XMLTO, [xmlto false])
AC_CHECK_PROGS(DOCBOOK2PDF, [docbook2pdf false])
AC_CONFIG_FILES([config.make])
AC_OUTPUT
AC_CHECK_PROGS(ASCIIDOC, [asciidoc false])
AC_CHECK_PROGS(XMLTO, [xmlto false])
AC_CHECK_PROGS(DOCBOOK2PDF, [docbook2pdf false])
AC_CONFIG_FILES([config.make])
AC_OUTPUT
-
-case "$LIBS" in
-*-lncursesw*) ;;
-*) AC_MSG_RESULT([NOTE: The found ncurses library does not support wide-char.])
- AC_MSG_RESULT([NOTE: This means that tig will not correctly render UTF-8])
-esac