Treat project directory as in version control if .git is

either directory or file.
This commit is contained in:
John Safranek
2016-09-08 16:27:30 -07:00
parent 78c0f98ea9
commit 4087f6904c
2 changed files with 6 additions and 3 deletions

View File

@ -13,7 +13,7 @@ if test -d .git; then
fi fi
# If this is a source checkout then call autoreconf with error as well # If this is a source checkout then call autoreconf with error as well
if test -d .git; then if test -e .git; then
WARNINGS="all,error" WARNINGS="all,error"
# touch fips files for non fips distribution # touch fips files for non fips distribution
touch ./ctaocrypt/src/fips.c touch ./ctaocrypt/src/fips.c

View File

@ -45,7 +45,10 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#serial 6 #serial 6.1
#
# Added tweak for git. The base repo's .git is a directory. Any worktree's
# .git is a file. Use -e to check for either dir or file.
AC_DEFUN([AX_VCS_SYSTEM], AC_DEFUN([AX_VCS_SYSTEM],
[AC_PREREQ([2.63])dnl [AC_PREREQ([2.63])dnl
@ -54,7 +57,7 @@ AC_DEFUN([AX_VCS_SYSTEM],
AS_IF([test -d ".bzr"],[ac_cv_vcs_system="bazaar"]) AS_IF([test -d ".bzr"],[ac_cv_vcs_system="bazaar"])
AS_IF([test -d ".svn"],[ac_cv_vcs_system="svn"]) AS_IF([test -d ".svn"],[ac_cv_vcs_system="svn"])
AS_IF([test -d ".hg"],[ac_cv_vcs_system="mercurial"]) AS_IF([test -d ".hg"],[ac_cv_vcs_system="mercurial"])
AS_IF([test -d ".git"],[ac_cv_vcs_system="git"]) AS_IF([test -e ".git"],[ac_cv_vcs_system="git"])
]) ])
AC_DEFINE_UNQUOTED([VCS_SYSTEM],["$ac_cv_vcs_system"],[VCS system]) AC_DEFINE_UNQUOTED([VCS_SYSTEM],["$ac_cv_vcs_system"],[VCS system])
]) ])