BuildSystem: In OpenBSD, xmlstarlet is xml.

ASTERISK-27593

Change-Id: I1c7087f7f7582e40b3312c690d912c9a86466805

diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 18b3ee7b3810adaf8aab642adf2f5ba9a6cc69ee..dbb38a0345c9b6e951400cdb8e19e8d141bcca6c 100644 (file)
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -93,7 +93,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 cc39661f69840ebc000e414ff424b0a927a7f39b..62fca4a1e8930d78256ad1eb83455c2e1a80bd98 100755 (executable)
--- a/configure
+++ b/configure
@@ -7559,8 +7559,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 :
@@ -7586,7 +7588,6 @@ done
   done
 IFS=$as_save_IFS
 
-  test -z "$ac_cv_path_XMLSTARLET" && ac_cv_path_XMLSTARLET=":"
   ;;
 esac
 fi
@@ -7600,6 +7601,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 e333fafa1aa6ca10b24c1bc06c802b75e117dfb9..d46091e475164ff28e8912ddd7f7b3aadd4dad3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -282,7 +282,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], :)