Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/675?usp=email
to review the following change.
Change subject: configure: Allow to detect git checkout if .git is not a
directory
......................................................................
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 <fr...@lichtenheld.com>
---
M Makefile.am
M configure.ac
2 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/75/675/1
diff --git a/Makefile.am b/Makefile.am
index 87230fe..84b7112 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,9 +75,9 @@
README.wolfssl
config-version.h:
- @CONFIGURE_GIT_CHFILES="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT)
diff-files --name-status -r --ignore-submodules --quiet -- || echo \"+\"`"; \
- CONFIGURE_GIT_UNCOMMITTED="`GIT_DIR=\"$(top_srcdir)/.git\" $(GIT)
diff-index --cached --quiet --ignore-submodules HEAD || echo \"*\"`"; \
- 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`"; \
+ @CONFIGURE_GIT_CHFILES="`$(GIT) -C \"$(top_srcdir)\" diff-files
--name-status -r --ignore-submodules --quiet -- || echo \"+\"`"; \
+ CONFIGURE_GIT_UNCOMMITTED="`$(GIT) -C \"$(top_srcdir)\" diff-index
--cached --quiet --ignore-submodules HEAD || echo \"*\"`"; \
+ 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`"; \
echo "#define CONFIGURE_GIT_REVISION \"$${CONFIGURE_GIT_REVISION}\"" >
config-version.h.tmp; \
echo "#define CONFIGURE_GIT_FLAGS
\"$${CONFIGURE_GIT_CHFILES}$${CONFIGURE_GIT_UNCOMMITTED}\"" >>
config-version.h.tmp
diff --git a/configure.ac b/configure.ac
index 3e7c0be..75c0aa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1284,9 +1284,11 @@
AC_MSG_CHECKING([git checkout])
GIT_CHECKOUT="no"
-if test -n "${GIT}" -a -d "${srcdir}/.git"; then
- AC_DEFINE([HAVE_CONFIG_VERSION_H], [1], [extra version available in
config-version.h])
- GIT_CHECKOUT="yes"
+if test -n "${GIT}"; then
+ if ${GIT} -C "$srcdir" rev-parse --is-inside-work-tree >/dev/null 2>&1;
then
+ AC_DEFINE([HAVE_CONFIG_VERSION_H], [1], [extra version
available in config-version.h])
+ GIT_CHECKOUT="yes"
+ fi
fi
AC_MSG_RESULT([${GIT_CHECKOUT}])
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/675?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9b7a3df012e7606ddb04a944e3fa33247180e8dd
Gerrit-Change-Number: 675
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
