From 5bd2d70c3d68eef53c84fc940c252423b587df49 Mon Sep 17 00:00:00 2001 From: Sven Verdoolaege Date: Wed, 4 Dec 2013 16:03:53 +0100 Subject: [PATCH] AX_SUBMODULE: allow .git file in submodule Recent versions of git place a .git file in the submodule directory rather than a .git subdirectory. Update AX_SUBMODULE to take this possibility into account. Reported-by: Vladimir Klebanov Signed-off-by: Sven Verdoolaege --- m4/ax_submodule.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/ax_submodule.m4 b/m4/ax_submodule.m4 index 70f60d2..8129312 100644 --- a/m4/ax_submodule.m4 +++ b/m4/ax_submodule.m4 @@ -46,7 +46,7 @@ $3) bundled) if test -d $srcdir/.git -a \ -d $srcdir/$1 -a \ - ! -d $srcdir/$1/.git; then + "`cd $srcdir; git submodule status $1 | cut -c1`" = '-'; then AC_MSG_WARN([git repo detected, but submodule $1 not initialized]) AC_MSG_WARN([You may want to run]) AC_MSG_WARN([ git submodule init]) -- 2.11.4.GIT