diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-07-17 20:52:34 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-07-17 20:52:34 +0200 |
| commit | 63f2ed6dd7b4b87dbe175f8dda35204dee8737e0 (patch) | |
| tree | ed1ac8fdbf0c0779d079749fee5c39bd8bee61f2 | |
| parent | 30fcda6cb5959af2a1911bb40bf769be6b554450 (diff) | |
| parent | 8c85c9999661a57e1bd10e79ad398b812ff4ea87 (diff) | |
Merge branch 'osx' of git://gitorious.org/~flameeyes/pulseaudio/flameeyes-pulseaudio
| -rwxr-xr-x | bootstrap.sh | 10 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index aa9755fa..79e0a7dc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -40,10 +40,16 @@ run_versioned() { set -ex +case $(uname) in + *Darwin*) + LIBTOOLIZE="glibtoolize" + ;; +esac + if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then echo "Activating pre-commit hook." - cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit - chmod -c +x .git/hooks/pre-commit + cp -pv .git/hooks/pre-commit.sample .git/hooks/pre-commit + chmod -v +x .git/hooks/pre-commit fi if [ -f .tarball-version ]; then diff --git a/configure.ac b/configure.ac index 9b49f23e..18007357 100644 --- a/configure.ac +++ b/configure.ac @@ -76,6 +76,7 @@ case $host in ;; *-*-darwin* ) AC_DEFINE([_POSIX_C_SOURCE], [200112L], [Needed to get clock_gettime on Mac OS X]) + AC_DEFINE([_DARWIN_C_SOURCE], [200112L], [Needed to get NSIG on Mac OS X]) ;; esac |