View | Details | Raw Unified | Return to bug 243678 | Differences between
and this patch

Collapse All | Expand All

(-)b/configure (-14 / +19 lines)
Lines 88-93 for x do Link Here
88
	PKG_CONFIG) PKG_CONFIG=$var;;
88
	PKG_CONFIG) PKG_CONFIG=$var;;
89
	--with-hook) HOOKSCRIPTS="$HOOKSCRIPTS${HOOKSCRIPTS:+ }$var";;
89
	--with-hook) HOOKSCRIPTS="$HOOKSCRIPTS${HOOKSCRIPTS:+ }$var";;
90
	--with-hooks|HOOKSCRIPTS) HOOKSCRIPTS=$var; HOOKSET=true;;
90
	--with-hooks|HOOKSCRIPTS) HOOKSCRIPTS=$var; HOOKSET=true;;
91
	--with-eghook) EGHOOKSCRIPTS="$EGHOOKSCRIPTS${EGHOOKSCRIPTS+ }$var";;
92
	--with-hooks|EGHOOKSCRIPTS) EGHOOKSCRIPTS=$var; EGHOOKSET=true;;
91
	--with-default-hostname) _DEFAULT_HOSTNAME=$var;;
93
	--with-default-hostname) _DEFAULT_HOSTNAME=$var;;
92
	--build) BUILD=$var;;
94
	--build) BUILD=$var;;
93
	--host) HOST=$var; HOSTCC=$var-;;
95
	--host) HOST=$var; HOSTCC=$var-;;
Lines 1712-1727 if ! $HOOKSET; then Link Here
1712
	fi
1714
	fi
1713
fi
1715
fi
1714
1716
1717
find_hook()
1718
{
1719
	for h in [0-9][0-9]"-$x" [0-9][0-9]"-$x.in" \
1720
	    [0-9][0-9]"-$x.sh" [0-9][0-9]"-$x.sh.in" \
1721
	    [0-9][0-9]"-$x.conf" [0-9][0-9]"-$x.conf.in"
1722
	do
1723
		[ -e "$h" ] && break
1724
	done
1725
	[ -e "$h" ] || return 1
1726
	echo "${h%%.in}"
1727
	return 0
1728
}
1729
1715
if cd hooks; then
1730
if cd hooks; then
1716
	for x in $HOOKSCRIPTS; do
1731
	for x in $HOOKSCRIPTS; do
1717
		printf "Finding hook $x ... "
1732
		printf "Finding hook $x ... "
1718
		for h in [0-9][0-9]"-$x" \
1733
		h=$(find_hook "$x")
1719
		    [0-9][0-9]"-$x.sh" \
1734
		if [ -z "$h" ]; then
1720
		    [0-9][0-9]"-$x.conf"
1721
		do
1722
			[ -e "$h" ] && break
1723
		done
1724
		if [ ! -e "$h" ]; then
1725
			echo "no"
1735
			echo "no"
1726
		else
1736
		else
1727
			echo "$h"
1737
			echo "$h"
Lines 1733-1745 if cd hooks; then Link Here
1733
	done
1743
	done
1734
	for x in $EGHOOKSCRIPTS; do
1744
	for x in $EGHOOKSCRIPTS; do
1735
		printf "Finding example hook $x ... "
1745
		printf "Finding example hook $x ... "
1736
		for h in [0-9][0-9]"-$x" \
1746
		h=$(find_hook "$x")
1737
		    [0-9][0-9]"-$x.sh" \
1747
		if [ -z "$h" ]; then
1738
		    [0-9][0-9]"-$x.conf"
1739
		do
1740
			[ -e "$h" ] && break
1741
		done
1742
		if [ ! -e "$h" ]; then
1743
			echo "no"
1748
			echo "no"
1744
		else
1749
		else
1745
			echo "$h"
1750
			echo "$h"

Return to bug 243678