Merge pull request #3 from hughmcmaster/debian-m4

autogen.sh: Remove obsolete FORBIDDEN_M4MACROS() code paths

1 files changed, 3 insertions, 28 deletions

diff --git a/autogen.sh b/autogen.sh
index 2dbb6e5..1a47c93 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -99,7 +99,7 @@ compare_versions() {
 }
 
 REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-}
-FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-}
+
 require_m4macro() {
     case "$REQUIRED_M4MACROS" in
 	$1\ * | *\ $1\ * | *\ $1) ;;
@@ -107,13 +107,6 @@ require_m4macro() {
     esac
 }
 
-forbid_m4macro() {
-    case "$FORBIDDEN_M4MACROS" in
-	$1\ * | *\ $1\ * | *\ $1) ;;
-	*) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
-    esac
-}
-
 add_to_cm_macrodirs() {
     case $cm_macrodirs in
     "$1 "* | *" $1 "* | *" $1") ;;
@@ -180,28 +173,10 @@ check_m4macros() {
 	    fi
 	done
     fi
-    if [ -n "$FORBIDDEN_M4MACROS" ]; then
-	printbold "Checking for forbidden M4 macros..."
-	# check that each macro file is in one of the macro dirs
-	for cm_macro in $FORBIDDEN_M4MACROS; do
-	    cm_macrofound=false
-	    for cm_dir in $cm_macrodirs; do
-		if [ -f "$cm_dir/$cm_macro" ]; then
-		    cm_macrofound=true
-		    break
-		fi
-	    done
-	    if $cm_macrofound; then
-		printerr "  $cm_macro found (should be cleared from macros dir)"
-		cm_status=1
-	    fi
-	done
-    fi
     if [ "$cm_status" != 0 ]; then
 	printerr "***Error***: some autoconf macros required to build $PKG_NAME"
-	printerr "  were not found in your aclocal path, or some forbidden"
-	printerr "  macros were found.  Perhaps you need to adjust your"
-	printerr "  ACLOCAL_FLAGS?"
+	printerr "  were not found in your aclocal path."
+	printerr "  Perhaps you need to adjust your ACLOCAL_FLAGS?"
 	printerr
     fi
     return $cm_status