Browse code
configure: Allow to detect git checkout if .git is not a directory
E.g. if you use openvpn as a git submodule, it can be a
file that points to the parent's git directory.
The changes to Makefile.am are not strictly required, they
still work with that case, but I wanted to keep the usage
consistent.
Change-Id: I9b7a3df012e7606ddb04a944e3fa33247180e8dd
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
Acked-by: Yuriy Darnobyt <yura.uddr@gmail.com>
Message-Id: <20240906172112.87148-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29092.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Frank Lichtenheld authored on 2024/09/07 02:21:12Showing 2 changed files
| ... | ... |
@@ -75,9 +75,9 @@ dist_noinst_DATA = \ |
| 75 | 75 |
README.wolfssl |
| 76 | 76 |
|
| 77 | 77 |
config-version.h: |
| 78 |
- @CONFIGURE_GIT_CHFILES="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) diff-files --name-status -r --ignore-submodules --quiet -- || echo \"+\"`"; \ |
|
| 79 |
- CONFIGURE_GIT_UNCOMMITTED="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) diff-index --cached --quiet --ignore-submodules HEAD || echo \"*\"`"; \ |
|
| 80 |
- CONFIGURE_GIT_REVISION="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --symbolic-full-name HEAD | cut -d/ -f3-`/`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT) rev-parse --short=16 HEAD`"; \ |
|
| 78 |
+ @CONFIGURE_GIT_CHFILES="`$(GIT) -C \"$(top_srcdir)\" diff-files --name-status -r --ignore-submodules --quiet -- || echo \"+\"`"; \ |
|
| 79 |
+ CONFIGURE_GIT_UNCOMMITTED="`$(GIT) -C \"$(top_srcdir)\" diff-index --cached --quiet --ignore-submodules HEAD || echo \"*\"`"; \ |
|
| 80 |
+ CONFIGURE_GIT_REVISION="`$(GIT) -C \"$(top_srcdir)\" rev-parse --symbolic-full-name HEAD | cut -d/ -f3-`/`$(GIT) -C \"$(top_srcdir)\" rev-parse --short=16 HEAD`"; \ |
|
| 81 | 81 |
echo "#define CONFIGURE_GIT_REVISION \"$${CONFIGURE_GIT_REVISION}\"" > config-version.h.tmp; \
|
| 82 | 82 |
echo "#define CONFIGURE_GIT_FLAGS \"$${CONFIGURE_GIT_CHFILES}$${CONFIGURE_GIT_UNCOMMITTED}\"" >> config-version.h.tmp
|
| 83 | 83 |
|
| ... | ... |
@@ -1308,9 +1308,11 @@ fi |
| 1308 | 1308 |
|
| 1309 | 1309 |
AC_MSG_CHECKING([git checkout]) |
| 1310 | 1310 |
GIT_CHECKOUT="no" |
| 1311 |
-if test -n "${GIT}" -a -d "${srcdir}/.git"; then
|
|
| 1312 |
- AC_DEFINE([HAVE_CONFIG_VERSION_H], [1], [extra version available in config-version.h]) |
|
| 1313 |
- GIT_CHECKOUT="yes" |
|
| 1311 |
+if test -n "${GIT}"; then
|
|
| 1312 |
+ if ${GIT} -C "$srcdir" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
|
|
| 1313 |
+ AC_DEFINE([HAVE_CONFIG_VERSION_H], [1], [extra version available in config-version.h]) |
|
| 1314 |
+ GIT_CHECKOUT="yes" |
|
| 1315 |
+ fi |
|
| 1314 | 1316 |
fi |
| 1315 | 1317 |
AC_MSG_RESULT([${GIT_CHECKOUT}])
|
| 1316 | 1318 |
|