Don't introduce a syntax error in configure; sh(1) is not make(1) and here the expansion happens in sh. ok rpointel@
46 lines
1.7 KiB
Plaintext
46 lines
1.7 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.7 2011/12/10 19:06:03 naddy Exp $
|
|
--- configure.in.orig Sun Dec 14 01:13:52 2008
|
|
+++ configure.in Mon Dec 15 20:13:14 2008
|
|
@@ -201,7 +201,7 @@ case $ac_sys_system/$ac_sys_release in
|
|
# On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
|
|
# even though select is a POSIX function. Reported by J. Ribbens.
|
|
# Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
|
|
- OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0123@:>@)
|
|
+ OpenBSD*)
|
|
define_xopen_source=no
|
|
# OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
|
|
# also defined. This can be overridden by defining _BSD_SOURCE
|
|
@@ -1522,19 +1522,7 @@ then
|
|
LDSHARED="ld -Bshareable ${LDFLAGS}"
|
|
fi;;
|
|
OpenBSD*)
|
|
- if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
|
|
- then
|
|
- LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
|
|
- else
|
|
- case `uname -r` in
|
|
- [[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
|
|
- LDSHARED="ld -Bshareable ${LDFLAGS}"
|
|
- ;;
|
|
- *)
|
|
- LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
|
|
- ;;
|
|
- esac
|
|
- fi;;
|
|
+ LDSHARED="$CC -shared ${LDFLAGS}";;
|
|
NetBSD*|DragonFly*) LDSHARED="cc -shared ${LDFLAGS}";;
|
|
OpenUNIX*|UnixWare*)
|
|
if test "$GCC" = "yes"
|
|
@@ -1678,9 +1666,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-U
|
|
|
|
# only check for sem_ini if thread support is requested
|
|
if test "$with_threads" = "yes" -o -z "$with_threads"; then
|
|
- AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
|
|
+# AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
|
|
# posix4 on Solaris 2.6
|
|
# pthread (first!) on Linux
|
|
+ LIBS="-pthread ${LIBS}"
|
|
fi
|
|
|
|
# check if we need libintl for locale functions
|