X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/6a19a30372cca7c252afcf6adbb31b6e9ecdee9b..de46362f24d53b4a6ccb9c70e446a1d32b05f08d:/configure.ac?ds=sidebyside diff --git a/configure.ac b/configure.ac index 65b5af3..764190a 100644 --- a/configure.ac +++ b/configure.ac @@ -12,12 +12,14 @@ AC_SEARCH_LIBS([wclear], [ncursesw ncurses curses], [], 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_CHECK_PROG(GIT, [git], [git], [AC_ERROR([git not found])]) +AC_MSG_CHECKING([which config command git supports]) +GIT_CONFIG="git repo-config" +git config --list >/dev/null && GIT_CONFIG="git config" +AC_MSG_RESULT([$GIT_CONFIG]) AC_DEFINE_UNQUOTED(GIT_CONFIG,"$GIT_CONFIG",[git config program]) + AC_CHECK_PROGS(ASCIIDOC, [asciidoc false]) AC_CHECK_PROGS(XMLTO, [xmlto false]) AC_CHECK_PROGS(DOCBOOK2PDF, [docbook2pdf false])