[evolution-data-server] Move the "$host" down when $host is actually set and don't set DL_LIB to libdl which is not availabl
- From: Jasper Lievisse Adriaanse <jasperla src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Move the "$host" down when $host is actually set and don't set DL_LIB to libdl which is not availabl
- Date: Tue, 12 Jul 2011 11:27:13 +0000 (UTC)
commit 27e8a5713a345fc276deb74daa26e982bd87dec7
Author: Antoine Jacoutot <ajacoutot openbsd org>
Date: Tue Jul 12 13:26:39 2011 +0200
Move the "$host" down when $host is actually set and don't set DL_LIB
to libdl which is not available on OpenBSD/FreeBSD.
https://bugzilla.gnome.org/show_bug.cgi?id=654444
configure.ac | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8c9a980..10ce6eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+
dnl Evolution-Data-Server version
m4_define([eds_major_version], [3])
m4_define([eds_minor_version], [1])
@@ -186,15 +187,6 @@ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
AC_SUBST(AM_CPPFLAGS)
-case "$host" in
-*openbsd*|*freebsd*)
- dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
- ;;
-*)
- LDFLAGS="$LDFLAGS -Wl,--no-undefined"
- ;;
-esac
-
dnl define disable deprecated for EBook and ECal .am files
case "$WARNING_FLAGS" in
*E_BOOK_DISABLE_DEPRECATED*)
@@ -285,6 +277,16 @@ dnl Gtk Doc stuff
dnl ******************************
GTK_DOC_CHECK(1.9)
+dnl This must appear after AC_CANONICAL_HOST, which defines $host.
+case "$host" in
+*openbsd*|*freebsd*)
+ dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
+ ;;
+*)
+ LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+ ;;
+esac
+
dnl ******************************
dnl Check for Win32
dnl ******************************
@@ -299,6 +301,13 @@ case "$host" in
AC_CACHE_VAL(ac_cv_have_addrinfo, [ac_cv_have_addrinfo=yes])
AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
;;
+*openbsd*|*freebsd*)
+ os_win32='no'
+ NO_UNDEFINED=''
+ SOCKET_LIBS=''
+ DL_LIB=''
+ LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
+ ;;
*)
os_win32='no'
NO_UNDEFINED=''
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]