[Asterisk-code-review] BuildSystem: In OpenBSD, xmlstarlet is xml. (asterisk[13])

[Alexander Traud]

Alexander Traud has uploaded this change for review. ( https://gerrit.asterisk.org/7994


Change subject: BuildSystem: In OpenBSD, xmlstarlet is xml.
......................................................................

BuildSystem: In OpenBSD, xmlstarlet is xml.

ASTERISK-27593

Change-Id: I1c7087f7f7582e40b3312c690d912c9a86466805
---
M Makefile.moddir_rules
M configure
M configure.ac
3 files changed, 10 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/94/7994/1

diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 18b3ee7..dbb38a0 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -93,7 +93,7 @@
 	@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 cc39661..62fca4a 100755
--- a/configure
+++ b/configure
@@ -7559,8 +7559,10 @@
 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 :
@@ -7586,7 +7588,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_XMLSTARLET" && ac_cv_path_XMLSTARLET=":"
   ;;
 esac
 fi
@@ -7600,6 +7601,10 @@
 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 e333faf..d46091e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,7 @@
 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], :)

-- 
To view, visit https://gerrit.asterisk.org/7994
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c7087f7f7582e40b3312c690d912c9a86466805
Gerrit-Change-Number: 7994
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180117/e3bc978d/attachment-0001.html>