From 9e592e2131463659aaa8c3a1598b4d615e8cd5b2 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Mon, 16 Jan 2006 22:03:31 +0100 Subject: [PATCH] A few changes to improve configuration of FSP - Use EL_ARG_DEPENDS(), the other way ended up in undefined symbols errors with --enable-fsp and no fsplib. - Also check for -lfsp in addition to -lfsplib. - This could probably also use a --with-fsplib or something to specify the path, had problems with that too, because fsplib-0.7 installed into /usr/local, ... --- configure.in | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index 80bb9d00..48b52614 100644 --- a/configure.in +++ b/configure.in @@ -1136,20 +1136,25 @@ dnl =================================================================== dnl FSP protocol dnl =================================================================== -EL_ARG_ENABLE(CONFIG_FSP, fsp, [FSP protocol], - [ --enable-fsp enable FSP protocol support]) - if test "x${enable_fsp}" != xno; then - AC_CHECK_HEADERS(fsplib.h, CONFIG_FSP=yes, CONFIG_FSP=no) + AC_CHECK_HEADERS(fsplib.h, HAVE_FSPLIB=yes, HAVE_FSPLIB=no) - if test "$CONFIG_FSP" = yes; then - AC_CHECK_LIB(fsplib, fsp_open_session, CONFIG_FSP=yes, CONFIG_FSP=no) - if test "$CONFIG_FSP" = yes; then + if test "$HAVE_FSPLIB" = yes; then + AC_CHECK_LIB(fsplib, fsp_open_session, HAVE_FSPLIB=yes, HAVE_FSPLIB=no) + if test "$HAVE_FSPLIB" = yes; then LIBS="$LIBS -lfsplib" + else + AC_CHECK_LIB(fsp, fsp_open_session, HAVE_FSPLIB=yes, HAVE_FSPLIB=no) + if test "$HAVE_FSPLIB" = yes; then + LIBS="$LIBS -lfsp" + fi fi fi fi +EL_ARG_DEPEND(CONFIG_FSP, fsp, [HAVE_FSPLIB:yes], [FSP protocol], + [ --enable-fsp enable FSP protocol support]) + EL_ARG_ENABLE(CONFIG_FTP, ftp, [FTP protocol], [ --disable-ftp disable ftp protocol support])