if test "$GCC" = yes; then
case "$host" in
*-*-solaris*)
- CFLAGS="$CFLAGS -Wall -Wno-char-subscripts"
+ CFLAGS="$CFLAGS -Wall -Wno-char-subscripts --pedantic"
;;
*)
- CFLAGS="$CFLAGS -Wall"
+ CFLAGS="$CFLAGS -Wall --pedantic"
;;
esac
fi
AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"])
-dnl Checks for the zlib compression library.
-AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present])
-if test "x$with_zlib" != xno ; then
- AC_CHECK_HEADERS(zlib.h,
- [AC_CHECK_LIB(z, zlibVersion,
- [ok_zlib=yes],,
- )])
-fi
-
-if test "x$ok_zlib" = xyes ; then
- LIBS="-lz $LIBS"
- AC_DEFINE(HAVE_ZLIB,[],[whether we have zlib])
-fi
-
-dnl Check for libcitadel
-AC_CHECK_HEADER(libcitadel.h,
- [AC_CHECK_LIB(citadel, libcitadel_version_string,
+dnl Checks for the libical iCalendar library.
+AC_CHECK_HEADER(libical/ical.h,
+ [AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix,
[
- LIBS="-lcitadel $LIBS"
+ LIBS="-lical $LIBS"
],
[
- AC_MSG_ERROR(libcitadel was not found or is not usable. Please install libcitadel.)
+ AC_MSG_ERROR(libical was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
]
,
)],
[
- AC_MSG_ERROR(libcitadel.h was not found or is not usable. Please install libcitadel.)
+ AC_MSG_ERROR(libical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
]
)
-dnl Checks for the libical iCalendar library.
-AC_CHECK_HEADER(libical/ical.h,
- [AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix,
+dnl Check for libcitadel
+AC_CHECK_HEADER(libcitadel.h,
+ [AC_CHECK_LIB(citadel, libcitadel_version_string,
[
- LIBS="-lical $LIBS"
+ LIBS="-lcitadel $LIBS"
],
[
- AC_MSG_ERROR(libical was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
+ AC_MSG_ERROR(libcitadel was not found or is not usable. Please install libcitadel.)
]
,
)],
[
- AC_MSG_ERROR(libical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
+ AC_MSG_ERROR(libcitadel.h was not found or is not usable. Please install libcitadel.)
]
)
+found_ssl=no
# The big search for OpenSSL
if test "$with_ssl" != "no"; then
saved_LIBS="$LIBS"
if test "x$ac_cv_openssldir" != "xno" ; then
AC_DEFINE(HAVE_OPENSSL,[],[whethe we have openssl])
+ found_ssl=yes
LIBS="-lssl -lcrypto $LIBS"
dnl Need to recover ssldir - test above runs in subshell
ssldir=$ac_cv_openssldir
[ if test "x$withval" != "xno" ; then
ssl_dir="$withval"
+ if test "$found_ssl" = "no"; then
+ echo "Your setup was incomplete; ssldir doesn't make sense without openssl"
+ exit
+ fi
fi
AC_SUBST(MAKE_SSL_DIR)
]
AC_OUTPUT(Makefile po/Makefile )
echo ------------------------------------------------------------------------
-echo 'zlib compression: ' $ok_zlib
echo 'Character set conversion support:' $ok_iconv
echo 'National language support: ' $ok_nls
echo