aboutsummaryrefslogtreecommitdiffstats
path: root/m4
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 /m4
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 '')
-rw-r--r--m4/shout.m411
1 files changed, 11 insertions, 0 deletions
diff --git a/m4/shout.m4 b/m4/shout.m4
index 9fad512e6..4eba5c09b 100644
--- a/m4/shout.m4
+++ b/m4/shout.m4
@@ -53,6 +53,17 @@ then
ac_save_CPPFLAGS="$CPPFLAGS"
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
+
+ # freebsd 6.1 + shout 2.2 port seems to leave pthread out
+ case "$host_os" in
+ freebsd*)
+ case "$SHOUT_CFLAGS$SHOUT_CPPFLAGS" in
+ *-D_THREAD_SAFE*)
+ SHOUT_LIBS="$SHOUT_LIBS -lpthread"
+ ;;
+ esac
+ ;;
+ esac
CPPFLAGS="$CPPFLAGS $SHOUT_CPPFLAGS"
CFLAGS="$CFLAGS $SHOUT_CFLAGS"
LIBS="$SHOUT_LIBS $LIBS"