1 files changed, 16 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index 6b0787ba..48242f01 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -124,13 +124,23 @@ fi
 echo "Generating configuration files for $package, please wait...."
 
 ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/m4"
-if [ -d /usr/local/share/aclocal ]; then
-	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I /usr/local/share/aclocal"
-fi
 
-# if [ -d "/usr/local/share/`basename $ACLOCAL`" ]; then
-	# ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I /usr/local/share/`basename $ACLOCAL`"
-# fi
+# /usr/share/aclocal is most likely included by default, already...
+ac_local_paths='
+/usr/local/share/aclocal
+/sw/share/aclocal
+/usr/pkg/share/aclocal
+/opt/share/aclocal
+/usr/gnu/share/aclocal
+'
+
+for i in $ac_local_paths; do
+	if test -d "$i"; then
+		ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $i"
+		# we probably only want one of these...
+		break
+	fi
+done
 
 echo "  $ACLOCAL $ACLOCAL_FLAGS"
 $ACLOCAL $ACLOCAL_FLAGS