From 1de7583029a1ac7904186187895a6a2513ce3138 Mon Sep 17 00:00:00 2001 From: Karl Heyes Date: Mon, 21 Apr 2003 17:52:12 +0000 Subject: [PATCH] autoconf updates. Now builds on OpenBSD svn path=/trunk/icecast/; revision=4620 --- acinclude.m4 | 2 +- configure.in | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6da9cb14..a8311de3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -465,7 +465,7 @@ if test "x$acx_pthread_ok" = xyes; then if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi - AC_CHECK_TYPES(pthread_rwlock_t) + AC_CHECK_TYPES(pthread_rwlock_t,,,[#include ]) LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" diff --git a/configure.in b/configure.in index cf3064d6..0a40e4ca 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,12 @@ dnl Set some options based on environment SOCKET_LIBS= -AC_DEFINE(_XOPEN_SOURCE, 500, [Define if you have POSIX and XPG specifications]) +case "$ac_cv_host" in + *openbsd*) + ;; + *) AC_DEFINE(_XOPEN_SOURCE, 500, [Define if you have POSIX and XPG specifications]) + ;; +esac if test -z "$GCC"; then case $host in *-*-irix*) @@ -24,7 +29,7 @@ if test -z "$GCC"; then DEBUG="-v -g -D_REENTRANT" CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT" PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT" - SOCKET_LIBS="-lnsl -lsocket -lresolv" + SOCKET_LIBS="-lnsl -lsocket -lresolv" ;; *) DEBUG="-g -D_REENTRANT" @@ -38,35 +43,30 @@ else DEBUG="-g -Wall -fsigned-char -D_REENTRANT -D_GNU_SOURCE" CFLAGS="-O20 -ffast-math -fsigned-char -D_REENTRANT -D_GNU_SOURCE" PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char -D_REENTRANT -D_GNU_SOURCE" - LIBS=" $LIBS -lpthread" ;; sparc-sun-solaris*) DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT" CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT" PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT" - SOCKET_LIBS="-lnsl -lsocket -lresolv" - LIBS=" $LIBS -lpthread" + SOCKET_LIBS="-lnsl -lsocket -lresolv" ;; - *-pc-solaris*) + *-pc-solaris*) DEBUG="-g -Wall -fsigned-char -D_REENTRANT" CFLAGS="-O20 -ffast-math -fsigned-char -D_REENTRANT" PROFILE="-pg -g -O20 -fsigned-char -D_REENTRANT" - SOCKET_LIBS="-lnsl -lsocket -lresolv" - LIBS=" $LIBS -lpthread" + SOCKET_LIBS="-lnsl -lsocket -lresolv" ;; *freebsd*) - DEBUG="-g -Wall -fsigned-char -D_REENTRANT" - CFLAGS="-O20 -fsigned-char -D_REENTRANT" - PROFILE="-O20 -g -pg -fsigned-char -D_REENTRANT" - LIBS=" $LIBS -pthread" - ogg_prefix="/usr/local" - vorbis_prefix="/usr/local" + DEBUG="-g -Wall -fsigned-char" + CFLAGS="-O20 -fsigned-char" + PROFILE="-O20 -g -pg -fsigned-char" + ogg_prefix="/usr/local" + vorbis_prefix="/usr/local" ;; *) - DEBUG="-g -Wall -fsigned-char -D_REENTRANT" - CFLAGS="-O20 -fsigned-char -D_REENTRANT" - PROFILE="-O20 -g -pg -fsigned-char -D_REENTRANT" - LIBS=" $LIBS -lpthread" + DEBUG="-g -Wall -fsigned-char" + CFLAGS="-O20 -Wall -fsigned-char" + PROFILE="-O20 -g -pg -Wall -fsigned-char" ;; esac fi