From 91e53376e064f90b92468f21a8c5ba4cf1337199 Mon Sep 17 00:00:00 2001 From: Alexander Traud <pabstraud@compuserve.com> Date: Wed, 17 Jan 2018 13:47:45 +0100 Subject: [PATCH] BuildSystem: In OpenBSD, xmlstarlet is xml. ASTERISK-27593 Change-Id: I1c7087f7f7582e40b3312c690d912c9a86466805 --- Makefile.moddir_rules | 2 +- configure | 11 ++++++++--- configure.ac | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 917c8e08ca..5d82088a95 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -115,7 +115,7 @@ ifneq ($(findstring :,$(XMLSTARLET)$(BASH)),:) @if [ -f .moduleinfo ] ; then \ declare -A DISABLED_MODS ;\ for x in $(MENUSELECT_$(MENUSELECT_CATEGORY)) ; do DISABLED_MODS[$${x}]=1 ; done ;\ - EXTERNAL_MODS=$$(xmlstarlet sel -t -m "/category/member[support_level = 'external']" -v "@name" -n .moduleinfo) ;\ + EXTERNAL_MODS=$$($(XMLSTARLET) sel -t -m "/category/member[support_level = 'external']" -v "@name" -n .moduleinfo) ;\ for x in $${EXTERNAL_MODS} ; do \ if [ -z "$${DISABLED_MODS[$${x}]}" ] ; then \ $(ASTTOPDIR)/build_tools/download_externals $${x} ;\ diff --git a/configure b/configure index d47fb88d96..ee58ab812b 100755 --- a/configure +++ b/configure @@ -7598,8 +7598,10 @@ $as_echo "no" >&6; } fi -# Extract the first word of "xmlstarlet", so it can be a program name with args. -set dummy xmlstarlet; ac_word=$2 +for ac_prog in xmlstarlet xml +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_XMLSTARLET+:} false; then : @@ -7625,7 +7627,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_XMLSTARLET" && ac_cv_path_XMLSTARLET=":" ;; esac fi @@ -7639,6 +7640,10 @@ $as_echo "no" >&6; } fi + test -n "$XMLSTARLET" && break +done +test -n "$XMLSTARLET" || XMLSTARLET=":" + # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/configure.ac b/configure.ac index 2f51f31b0b..43ec7576e6 100644 --- a/configure.ac +++ b/configure.ac @@ -281,7 +281,7 @@ AC_PATH_PROG([RUBBER], [rubber], :) AC_PATH_PROG([CATDVI], [catdvi], :) AC_PATH_PROG([KPATHSEA], [kpsewhich], :) AC_PATH_PROG([XMLLINT], [xmllint], :) -AC_PATH_PROG([XMLSTARLET], [xmlstarlet], :) +AC_PATH_PROGS([XMLSTARLET], [xmlstarlet xml], :) AC_PATH_PROG([BASH], [bash], :) AC_PATH_PROG([GIT], [git], :) AC_PATH_PROG([ALEMBIC], [alembic], :) -- GitLab