From: Sage Weil <sage@newdream.net>
Date: Thu, 11 Nov 2010 22:28:18 +0000 (-0800)
Subject: Merge branch 'rc' into unstable
X-Git-Tag: v0.24~192
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8b3271f45cc4a87e3f3f212d22e3d34ff13da44;p=ceph.git

Merge branch 'rc' into unstable

Conflicts:
	configure.ac
	src/Makefile.am
---

f8b3271f45cc4a87e3f3f212d22e3d34ff13da44
diff --cc configure.ac
index 19623f5b76c5,81336711f59d..000e89223503
--- a/configure.ac
+++ b/configure.ac
@@@ -160,11 -160,8 +160,12 @@@ AC_CHECK_HEADER([histedit.h]
  AC_CHECK_HEADER([openssl/md5.h],
  	[],
  	[AC_MSG_ERROR([Sorry you need openssl dev files (libssl-dev on debian)])])
+ PKG_CHECK_MODULES([OPENSSL], [openssl])
  
 +AC_CHECK_HEADER([linux/fiemap.h],
 +	[AC_DEFINE([HAVE_FIEMAP_H], [], [linux/fiemap.h was found, fiemap ioctl will be used])],
 +	[AC_MSG_NOTICE([linux/fiemap.h was not found, fiemap ioctl will not be used])])
 +
  AC_CHECK_HEADERS([sys/xattr.h arpa/inet.h netdb.h netinet/in.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/statvfs.h sys/time.h sys/vfs.h syslog.h utime.h])
  
  # sync_file_range
diff --cc src/Makefile.am
index 238e5e47f589,6a566d25a540..dd45ceb5eebc
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -224,9 -225,9 +225,9 @@@ bin_PROGRAMS += testrados testradosp
  endif
  
  radosacl_SOURCES = radosacl.cc
- radosacl_LDADD = librados.la -lpthread -lm -lcrypto
+ radosacl_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS)
 -rbd_SOURCES = rbd.cc
 +rbd_SOURCES = rbd.cc common/fiemap.cc
- rbd_LDADD = librados.la -lpthread -lm -lcrypto
+ rbd_LDADD = librados.la -lpthread -lm $(OPENSSL_LIBS)
  bin_PROGRAMS += radosacl rbd
  
  if WITH_RADOSGW