matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

build: check for .git in configure.ac

Browse source 
Don't error out when someone tries using --with-pkg-git-version on
something that isn't actually a git checkout (like a dist tarball).

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2012-12-13 11:20:50 +01:00
parent 4209a88759
commit a16dcf7c11
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure.ac
View file

@ -195,10 +195,7 @@ AC_ARG_WITH(pkg-extra-version,
[EXTRAVERSION=$withval],)
AC_ARG_WITH(pkg-git-version,
AS_HELP_STRING([--with-pkg-git-version], [add git information to MOTD and build version string]),
[ if test "x$withval" != "xno"; then
with_pkg_git_version="1"
AC_DEFINE(GIT_VERSION, [1], [include git version info])
fi ],)
[ test "x$withval" != "xno" && with_pkg_git_version="yes" ])
AC_ARG_ENABLE(vtysh,
[ --enable-vtysh include integrated vty shell for Quagga])
AC_ARG_ENABLE(ipv6,
@ -410,7 +407,14 @@ if test "x${EXTRAVERSION}" != "x" ; then
PACKAGE_STRING="${PACKAGE_STRING}${EXTRAVERSION}"
fi
AM_CONDITIONAL([GIT_VERSION], [test "x$with_pkg_git_version" != "x"])
if test "x$with_pkg_git_version" = "xyes"; then
if test -d "${srcdir}/.git"; then
AC_DEFINE(GIT_VERSION, [1], [include git version info])
else with_pkg_git_version="no"
AC_MSG_WARN([--with-pkg-git-version given, but this is not a git checkout])
fi
fi
AM_CONDITIONAL([GIT_VERSION], [test "x$with_pkg_git_version" = "xyes"])
dnl ------------------------------------
dnl Check C keywords and standard types