Explorar o código

Fix compile on BSD platforms.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2229 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake %!s(int64=16) %!d(string=hai) anos
pai
achega
c4fde87acf
Modificáronse 2 ficheiros con 5 adicións e 1 borrados
  1. 4 0
      configure.ac
  2. 1 1
      lib/Makefile.am

+ 4 - 0
configure.ac

@@ -194,6 +194,7 @@ AC_ARG_WITH([socket-dir],
 # OS detection
 # THIS SECTION MUST DIE!
 CP=cp
+OS_LDL="-ldl"
 case "$host_os" in
 	*linux*)
 		AC_DEFINE_UNQUOTED([COROSYNC_LINUX], [1],
@@ -225,11 +226,14 @@ case "$host_os" in
 	*bsd*)
 		AC_DEFINE_UNQUOTED([COROSYNC_BSD], [1],
 				   [Compiling for BSD platform])
+		AC_DEFINE_UNQUOTED([MAP_ANONYMOUS], [MAP_ANON],
+				   [Shared memory define for Darwin platform])
 		OS_CFLAGS=""
 		OS_CPPFLAGS="-I/usr/local/include"
 		OS_LDFLAGS="-L/usr/local/lib"
 		OS_DYFLAGS="-export-dynamic"
 		DARWIN_OPTS=""
+		OS_LDL=""
 	;;
 	*solaris*)
 		AC_DEFINE_UNQUOTED([COROSYNC_SOLARIS], [1],

+ 1 - 1
lib/Makefile.am

@@ -114,7 +114,7 @@ libconfdb.so.$(SONAME): confdb.o sa-confdb.o ../lcr/lcr_ifact.o libcoroipcc.so.$
 	$(CC) -shared -o $@ \
 		-Wl,-soname=libconfdb.so.$(SOMAJOR) \
 		-Wl,-version-script=$(srcdir)/libconfdb.versions \
-		$^ $(LDFLAGS) $(OS_DYFLAGS) -ldl $(AM_LDFLAGS)
+		$^ $(LDFLAGS) $(OS_DYFLAGS) $(OS_LDL) $(AM_LDFLAGS)
 	ln -sf libconfdb.so.$(SONAME) libconfdb.so
 	ln -sf libconfdb.so.$(SONAME) libconfdb.so.$(SOMAJOR)