projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
736ef46
)
* remove libz crap, libcitadel does this now.
author
Wilfried Göesgens
<willi@citadel.org>
Sat, 13 Dec 2008 22:37:50 +0000
(22:37 +0000)
committer
Wilfried Göesgens
<willi@citadel.org>
Sat, 13 Dec 2008 22:37:50 +0000
(22:37 +0000)
webcit/configure.ac
patch
|
blob
|
history
diff --git
a/webcit/configure.ac
b/webcit/configure.ac
index fa8de7976c2c96231968ef282f50128236e3e58b..e2ac5e7f1a0243a8c88c9f69c3a6b7902095ab1b 100644
(file)
--- a/
webcit/configure.ac
+++ b/
webcit/configure.ac
@@
-160,56
+160,43
@@
fi
AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"])
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(lib
citade
l.h,
- [AC_CHECK_LIB(
citadel, libcitadel_version_string
,
+dnl Check
s for the libical iCalendar library.
+AC_CHECK_HEADER(lib
ical/ica
l.h,
+ [AC_CHECK_LIB(
ical, icaltimezone_set_tzid_prefix
,
[
[
- LIBS="-l
citade
l $LIBS"
+ LIBS="-l
ica
l $LIBS"
],
[
],
[
- AC_MSG_ERROR(lib
citadel was not found or is not usable. Please install libcitadel.
)
+ AC_MSG_ERROR(lib
ical was not found and is required. More info: http://www.citadel.org/doku.php/installation:start
)
]
,
)],
[
]
,
)],
[
- AC_MSG_ERROR(lib
citadel.h was not found or is not usable. Please install libcitadel.
)
+ AC_MSG_ERROR(lib
ical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start
)
]
)
]
)
-dnl Check
s for the libical iCalendar library.
-AC_CHECK_HEADER(lib
ical/ica
l.h,
- [AC_CHECK_LIB(
ical, icaltimezone_set_tzid_prefix
,
+dnl Check
for libcitadel
+AC_CHECK_HEADER(lib
citade
l.h,
+ [AC_CHECK_LIB(
citadel, libcitadel_version_string
,
[
[
- LIBS="-l
ica
l $LIBS"
+ LIBS="-l
citade
l $LIBS"
],
[
],
[
- AC_MSG_ERROR(lib
ical was not found and is required. More info: http://www.citadel.org/doku.php/installation:start
)
+ AC_MSG_ERROR(lib
citadel was not found or is not usable. Please install libcitadel.
)
]
,
)],
[
]
,
)],
[
- AC_MSG_ERROR(lib
ical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start
)
+ AC_MSG_ERROR(lib
citadel.h was not found or is not usable. Please install libcitadel.
)
]
)
]
)
+
# The big search for OpenSSL
if test "$with_ssl" != "no"; then
saved_LIBS="$LIBS"
# The big search for OpenSSL
if test "$with_ssl" != "no"; then
saved_LIBS="$LIBS"
@@
-461,7
+448,6
@@
AC_CONFIG_HEADER(sysdep.h)
AC_OUTPUT(Makefile po/Makefile )
echo ------------------------------------------------------------------------
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
echo 'Character set conversion support:' $ok_iconv
echo 'National language support: ' $ok_nls
echo