~mdw
/
tig
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
518234f
)
configure: test for git binary and improve config subcommand test
author
Jonas Fonseca
<fonseca@diku.dk>
Thu, 20 Mar 2008 17:58:05 +0000
(18:58 +0100)
committer
Jonas Fonseca
<fonseca@diku.dk>
Thu, 20 Mar 2008 17:59:54 +0000
(18:59 +0100)
configure.ac
patch
|
blob
|
blame
|
history
diff --git
a/configure.ac
b/configure.ac
index
65b5af3
..
764190a
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-12,12
+12,14
@@
AC_SEARCH_LIBS([wclear], [ncursesw ncurses curses], [],
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_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_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])
AC_CHECK_PROGS(ASCIIDOC, [asciidoc false])
AC_CHECK_PROGS(XMLTO, [xmlto false])
AC_CHECK_PROGS(DOCBOOK2PDF, [docbook2pdf false])