gfarm (2.4.1-1.1) 00_libraries.patch

Summary

 configure.ac         |   10 +++++-----
 makes/var.mk         |    3 +--
 server/gfsd/Makefile |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

    
download this patch

Patch contents

Description: Change for linking to libraries.
Author: NIIBE Yutaka <gniibe@fsij.org>
Last-Update: 2010-11-24

Index: gfarm-2.4.0/configure.ac
===================================================================
--- gfarm-2.4.0.orig/configure.ac	2010-07-22 22:08:58.000000000 +0900
+++ gfarm-2.4.0/configure.ac	2010-11-24 11:18:09.000000000 +0900
@@ -199,7 +199,7 @@
 ])
 AC_MSG_RESULT([using \"${with_openssl}\"])
 
-openssl_libs='-lssl -lcrypto'
+openssl_libs='-lcrypto'
 if test x"${with_openssl}" = x"/usr"; then
    openssl_includes=
 else
@@ -584,13 +584,13 @@
 
 # We need to add those libraries to $LIBS at first,
 # otherwise some libraries (e.g. OpenLDAP and OpenSSL) cannot be linked.
-AC_CHECK_LIB(dl, dlopen)
-AC_CHECK_LIB(nsl, gethostname)	# SVR4 and derived
+# AC_CHECK_LIB(dl, dlopen)
+# AC_CHECK_LIB(nsl, gethostname)	# SVR4 and derived
 AC_CHECK_LIB(socket, socket)	# SVR4 and derived
-AC_CHECK_LIB(crypt, crypt)	# 4.4BSD and derived
+# AC_CHECK_LIB(crypt, crypt)	# 4.4BSD and derived
 AC_CHECK_LIB(compat, cuserid)	# NetBSD
 AC_CHECK_LIB(gen, basename)	# IRIX
-AC_CHECK_LIB(rt, fdatasync)	# Solaris
+# AC_CHECK_LIB(rt, fdatasync)	# Solaris
 AC_CHECK_LIB(cext, seteuid)	# HP-UX
 AC_CHECK_LIB(perfstat, perfstat_cpu_total) # AIX, to implement getloadavg()
 
Index: gfarm-2.4.0/makes/var.mk
===================================================================
--- gfarm-2.4.0.orig/makes/var.mk	2010-07-22 22:08:33.000000000 +0900
+++ gfarm-2.4.0/makes/var.mk	2010-11-24 11:18:09.000000000 +0900
@@ -27,8 +27,7 @@
 	-I$(top_builddir)/include -I$(top_srcdir)/include \
 	-DCOMPAT_GFARM_2_3
 COMMON_LDFLAGS = $(largefile_ldflags)
-GFARMLIB = -L$(top_builddir)/lib/libgfarm -lgfarm \
-	$(globus_gssapi_libs) $(openssl_libs)
+GFARMLIB = -L$(top_builddir)/lib/libgfarm -lgfarm
 
 INC_SRCDIR = $(top_srcdir)/include/gfarm
 INC_BUILDDIR = $(top_builddir)/include/gfarm
Index: gfarm-2.4.0/server/gfsd/Makefile
===================================================================
--- gfarm-2.4.0.orig/server/gfsd/Makefile	2010-07-22 22:08:48.000000000 +0900
+++ gfarm-2.4.0/server/gfsd/Makefile	2010-11-24 11:18:09.000000000 +0900
@@ -10,7 +10,7 @@
 CFLAGS = $(COMMON_CFLAGS) -I$(GFUTIL_SRCDIR) -I$(GFARMLIB_SRCDIR) \
 	$(openssl_includes) \
 	-DGFARM_DEFAULT_BINDIR=\"$(default_bindir)\"
-LDLIBS = $(COMMON_LDFLAGS) $(GFARMLIB) $(LIBS)
+LDLIBS = $(COMMON_LDFLAGS) $(GFARMLIB) $(LIBS) $(openssl_libs)
 DEPLIBS = $(DEPGFARMLIB)
 
 PROGRAM = gfsd