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

Jenkins2 asteriskteam at digium.com
Thu Jan 18 09:26:51 CST 2018


Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7993 )

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(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 917c8e0..5d82088 100644
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -115,7 +115,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 749b2fc..988f758 100755
--- a/configure
+++ b/configure
@@ -7604,8 +7604,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 :
@@ -7631,7 +7633,6 @@
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_XMLSTARLET" && ac_cv_path_XMLSTARLET=":"
   ;;
 esac
 fi
@@ -7645,6 +7646,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 f68338b..64ecbfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,7 +281,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/7993
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c7087f7f7582e40b3312c690d912c9a86466805
Gerrit-Change-Number: 7993
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180118/1a0f2d96/attachment-0001.html>


More information about the asterisk-code-review mailing list