diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-18 09:26:50 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-18 09:26:50 -0600 |
commit | 3fd96ec99688a25d97e1b244b8fbbda21897b228 (patch) | |
tree | 3d3c7e7067f798ee6d1dfda39bccf429cffabf43 | |
parent | df402c7bd7e413bbed24144bd3ca14eca8edeb2f (diff) | |
parent | 7e7a20642cef8dc586b795b0606ce233550916a4 (diff) |
Merge "BuildSystem: In OpenBSD, xmlstarlet is xml."
-rw-r--r-- | Makefile.moddir_rules | 2 | ||||
-rwxr-xr-x | configure | 11 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 917c8e08c..5d82088a9 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} ;\ @@ -7604,8 +7604,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 : @@ -7631,7 +7633,6 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_XMLSTARLET" && ac_cv_path_XMLSTARLET=":" ;; esac fi @@ -7645,6 +7646,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 f68338b2d..64ecbfab3 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], :) |