[ovs-dev,ovn,2/4] configure: Fix ctags identifier list.
diff mbox series

Message ID 20190925163400.1171-2-blp@ovn.org
State New
Headers show
Series
  • [ovs-dev,ovn,1/4] configure: Improve checks for OVS source and build directories.
Related show

Commit Message

Ben Pfaff Sept. 25, 2019, 4:33 p.m. UTC
Since compiler.h is an OVS header file, it needs to be relative to the
OVS source directory (and therefore we need to look at it after we've
located the OVS source directory).

Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 acinclude.m4 | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox series

diff --git a/acinclude.m4 b/acinclude.m4
index 9dfed9034910..6c3993e83b48 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1143,7 +1143,7 @@  dnl ctags ignores symbols with extras identifiers. This builds a list of
 dnl specially handled identifiers to be ignored.
 AC_DEFUN([OVS_CTAGS_IDENTIFIERS],
     AC_SUBST([OVS_CTAGS_IDENTIFIERS_LIST],
-           [`printf %s '-I "'; sed -n 's/^#define \(OVS_[A-Z_]\+\)(\.\.\.)$/\1+/p' ${srcdir}/include/openvswitch/compiler.h  | tr \\\n ' ' ; printf '"'`] ))
+           [`printf %s '-I "'; sed -n 's/^#define \(OVS_[A-Z_]\+\)(\.\.\.)$/\1+/p' ${OVSDIR}/include/openvswitch/compiler.h  | tr \\\n ' ' ; printf '"'`] ))
 
 dnl OVS_PTHREAD_SET_NAME
 dnl
diff --git a/configure.ac b/configure.ac
index a6f708812f87..65c57c7990fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,7 +171,6 @@  OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED])
 OVS_CONDITIONAL_CC_OPTION([-Wno-unused-parameter], [HAVE_WNO_UNUSED_PARAMETER])
 OVS_ENABLE_WERROR
 OVS_ENABLE_SPARSE
-OVS_CTAGS_IDENTIFIERS
 
 AC_ARG_VAR(KARCH, [Kernel Architecture String])
 AC_SUBST(KARCH)
@@ -180,6 +179,7 @@  OVS_CHECK_LINUX_TC
 OVS_CHECK_DPDK
 OVS_CHECK_PRAGMA_MESSAGE
 OVN_CHECK_OVS
+OVS_CTAGS_IDENTIFIERS
 AC_SUBST([OVS_CFLAGS])
 AC_SUBST([OVS_LDFLAGS])