aboutsummaryrefslogtreecommitdiffstats
path: root/autogen.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-07-18 09:55:15 +0000
committerEric Wong <normalperson@yhbt.net>2006-07-18 09:55:15 +0000
commit47037c6ac95189fbeb5fc07cdd8e5ea69c00992a (patch)
treee2c11d4f854d5f806152bb853b4c4bf762c36901 /autogen.sh
parent16c72e9742fabbadc393465fc8add6adcbac0796 (diff)
downloadmpd-47037c6ac95189fbeb5fc07cdd8e5ea69c00992a.tar.gz
mpd-47037c6ac95189fbeb5fc07cdd8e5ea69c00992a.tar.xz
mpd-47037c6ac95189fbeb5fc07cdd8e5ea69c00992a.zip
Some more autotools fixes/hacks/workarounds
autogen.sh: Detect more strange paths for aclocal on different packaging systems. This should help encourage more people to run svn code on their systems. configure.ac: Tested on FreeBSD (6.1). Darwin, OpenBSD, NetBSD info gleaned off the Makefile distributed with git. m4/shout.m4: The Shout 2.2 port on a FreeBSD 6.1 machine seemed problematic when it's compiled against pthreads, so this is a gross hack to force -lpthread on it git-svn-id: https://svn.musicpd.org/mpd/trunk@4390 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rwxr-xr-xautogen.sh22
1 files changed, 16 insertions, 6 deletions
diff --git a/autogen.sh b/autogen.sh
index 6b0787ba8..48242f016 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