dnl Eventually, this will look for the system one, or for OpenSSL
LIB_hcrypto="-lafshcrypto"
+LDFLAGS_hcrypto="-L\$(TOP_LIBDIR)"
AC_SUBST(LIB_hcrypto)
+AC_SUBST(LDFLAGS_hcrypto)
])
AC_DEFUN([SUMMARY], [
dnl Need to be careful what we check for here, as libroken contains
dnl different symbols on different platforms.
- AC_CHECK_LIB([roken], [ct_memcmp], [found_foundlib=true])
- AC_CHECK_HEADER([roken], [roken_foundheader=true])
+ AC_CHECK_LIB([roken], [ct_memcmp], [roken_foundlib=true])
+ AC_CHECK_HEADER([roken.h], [roken_foundheader=true])
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
- AS_IF([test x"$roken_foundlib" = xtrue && test x"roken_foundheader" = xtrue],
- [AS_IF([test x"$roken_path" != x],
- [CPPFLAGS_roken = "-I$roken_path/include"
- LDFLAGS_roken="-I$roken_path/lib"
+ AS_IF([test x"$roken_foundlib" = xtrue && test x"$roken_foundheader" = xtrue],
+ [AS_IF([test x"$roken_path" != x],
+ [CPPFLAGS_roken="-I$roken_path/include"
+ LDFLAGS_roken="-L$roken_path/lib"
LIB_roken="-lroken"])
$2],
[$3])
[AS_IF([test x"$roken_root" = x],
[_OPENAFS_ROKEN_CHECK([], [], [_OPENAFS_ROKEN_INTERNAL()])],
[_OPENAFS_ROKEN_CHECK($roken_root,
+ [],
[AC_MSG_ERROR([Cannot find roken at that location])])
])
])
KERN_OPTMZ = @KERN_OPTMZ@
LD = @LD@
LDFLAGS_roken = @LDFLAGS_roken@
+LDFLAGS_hcrypto = @LDFLAGS_hcrypto@
LEX = @LEX@
LIB_AFSDB = @LIB_AFSDB@
LIB_crypt = @LIB_crypt@
-I${srcdir} -I.
COMMON_CFLAGS=$(CFLAGS) ${DBG} ${OPTMZ} ${COMMON_INCL} ${INCLUDE_LIBINTL} \
- $(CPPFLAGS_libroken)
+ $(CPPFLAGS_roken)
-COMMON_LDFLAGS=$(LDFLAGS) $(LDFLAGS_roken) $(DBG) $(OPTMZ)
+COMMON_LDFLAGS=$(LDFLAGS) $(LDFLAGS_hcrypto) $(LDFLAGS_roken) $(DBG) $(OPTMZ)
# LWP Flags
LWP_CFLAGS=$(COMMON_CFLAGS) $(MODULE_CFLAGS) $(XCFLAGS) $(ARCHFLAGS)
${SHLIBOBJ}: ${OBJECTS} libafshcrypto.map
${TOP_OBJDIR}/src/config/shlib-build -d $(srcdir) -l libafshcrypto \
-M ${LIBMAJOR} -m ${LIBMINOR} -- \
- ${OBJECTS} -L$(TOP_LIBDIR) -lrokenafs ${MT_LIBS}
+ ${OBJECTS} $(LDFLAGS_roken) $(LIB_roken) ${MT_LIBS}
libafshcrypto.a: ${OBJECTS}
$(RM) -f $@
${TOP_LIBDIR}/libafsutil.a \
$(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) $(TEST_LIBS) $(XLIBS)
-CRULE1= $(CC) $(COMMON_INCLUDE) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
-CRULE2= $(CC) $(COMMON_INCLUDE) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
-CRULEPIC=$(CC) $(COMMON_INCLUDE) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) $(SHLIB_CFLAGS) -c $?
+CRULE1= $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
+CRULE2= $(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) $(WEBOPTS) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) -c $?
+CRULEPIC=$(CC) $(COMMON_INCLUDE) $(CPPFLAGS_roken) $(OPTF) -DKERNEL $(LIBJUAFS_FLAGS) $(CFLAGS) $(SHLIB_CFLAGS) -c $?
UAFSOBJ = \
$(UOBJ)/afs_atomlist.o \