aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog47
-rw-r--r--acconfig.h4
-rw-r--r--configure.in80
3 files changed, 51 insertions, 80 deletions
diff --git a/ChangeLog b/ChangeLog
index aded9409cb..cd03f4d043 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,50 @@
-2001-11-21 Abel Cheung <maddog@linuxhall.org>
+2001-12-04 Jeffrey Stedfast <fejj@ximian.com>
+
+ * configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a
+ string that will be appended to the X-Mailer header.
+
+2001-12-05 Ettore Perazzoli <ettore@ximian.com>
+
+ * HACKING: Put the patch review policy here.
+
+2001-12-04 Ettore Perazzoli <ettore@ximian.com>
+
+ * configure.in: Update version number to 1.0.0.99 for snapshot
+ purposes.
+
+2001-11-21 Jeffrey Stedfast <fejj@ximian.com>
+
+ * README: Updated. Don't say that the user needs to copy their
+ mozilla database files into ~/evolution, since Evolution now
+ builds it's own default database files if they don't exist and
+ also remove instructions for building with OpenSSL.
+
+ * acconfig.h: Remove HAVE_OPENSSL define
+
+ * configure.in: Remove checks for OpenSSL libraries.
+
+2001-11-21 Ettore Perazzoli <ettore@ximian.com>
+
+ * configure.in: Version 1.0. Require GtkHTML 1.0.
+
+ * data/evolution.desktop.in: Say "Ximian Evolution", not
+ "Evolution".
+
+2001-11-20 Wang Jian <lark@linux.net.cn>
+
+ * configure.in(ALL_LINGUAS): Re-Added zh_CN. It is checked
+ against gettext 0.10.40 and 0.10.35 without any problem.
+ Please contact me if anyone wants to disable it (AGAIN).
+
+2001-11-19 Abel Cheung <maddog@linuxhall.org>
* configure.in: I will keep adding zh_TW to ALL_LINGUAS before
- somebody is willing to tell me why it is deleted twice without
+ somebody is willing to tell me why it is deleted without
reason. It was checked against newest gettext (0.10.40) and
older gettext (0.10.35) without any problem. A few
translations are not removed from ALL_LINGUAS even though
they failed in msgfmt checking.
-2001-11-20 Wang Jian <lark@linux.net.cn>
-
- * configure.in(ALL_LINGUAS): Re-Added zh_CN for Simplified Chinese.
- If anyone wants to disable it, please contact me.
-
2001-11-14 Ettore Perazzoli <ettore@ximian.com>
* README: Updated.
diff --git a/acconfig.h b/acconfig.h
index 3bc0c6d604..6b65ef7d3e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,7 +17,6 @@
#undef HAVE_KRB5
#undef HAVE_NSS
#undef HAVE_SSL
-#undef HAVE_OPENSSL
#undef USE_DOT
#undef USE_FCNTL
#undef USE_FLOCK
@@ -34,6 +33,9 @@
/* Sub-version identification string. */
#undef SUB_VERSION
+/* Prewview-release string */
+#undef PREVIEW_RELEASE
+
/* Define if ctime_r takes three arguments */
#undef CTIME_R_THREE_ARGS
diff --git a/configure.in b/configure.in
index 2d9d9ee237..20291a98e1 100644
--- a/configure.in
+++ b/configure.in
@@ -2,15 +2,18 @@
AC_INIT(camel)
AM_CONFIG_HEADER(config.h)
-EVOLUTION_MAJOR_VERSION=0
-EVOLUTION_MINOR_VERSION=99
-EVOLUTION_MICRO_VERSION=2
-VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION
+EVOLUTION_MAJOR_VERSION=1
+EVOLUTION_MINOR_VERSION=0
+EVOLUTION_MICRO_VERSION=0
+EVOLUTION_NANO_VERSION=99
+VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION.$EVOLUTION_NANO_VERSION
PACKAGE=evolution
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(PREVIEW_RELEASE, " (Preview Release)")
+
AC_DEFUN(EVO_CHECK_LIB, [
dispname="$1"
pkgname="$2"
@@ -576,7 +579,7 @@ EVO_CHECK_LIB(libxml, xml, 1.8.10, 2.0)
EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.11)
EVO_CHECK_LIB(GAL, gal, 0.18.1)
-EVO_CHECK_LIB(GtkHTML, gtkhtml, 0.16)
+EVO_CHECK_LIB(GtkHTML, gtkhtml, 1.0)
dnl *************************
dnl CFLAGS and LIBS and stuff
@@ -925,73 +928,6 @@ AC_SUBST(NSPR_LDFLAGS)
AC_SUBST(NSS_CFLAGS)
AC_SUBST(NSS_LDFLAGS)
-dnl ******************************
-dnl OpenSSL
-dnl ******************************
-
-if test "$msg_ssl" = "no"; then
- AC_ARG_WITH(openssl-includes, [ --with-openssl-includes=PREFIX Location of OpenSSL includes.],
- with_openssl_includes="$withval", with_openssl_includes="/usr/include")
- have_openssl_includes="no"
- if test "x${with_openssl_includes}" != "xno"; then
- CPPFLAGS_save="$CPPFLAGS"
-
- AC_MSG_CHECKING(for OpenSSL includes)
- AC_MSG_RESULT("")
-
- CPPFLAGS="$CPPFLAGS -I$with_openssl_includes"
- AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h, [ openssl_includes="yes" ])
- CPPFLAGS="$CPPFLAGS_save"
-
- if test "x{$openssl_includes}" != "xno" -a "x{$openssl_includes}" != "x"; then
- have_openssl_includes="yes"
- OPENSSL_CFLAGS="-I$with_openssl_includes"
- else
- OPENSSL_CFLAGS=""
- fi
- else
- AC_MSG_CHECKING(for OpenSSL includes)
- AC_MSG_RESULT(no)
- fi
-
- AC_ARG_WITH(openssl-libs, [ --with-openssl-libs=PREFIX Location of OpenSSL libs.],
- with_openssl_libs="$withval")
- if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then
- LDFLAGS_save="$LDFLAGS"
-
- case $with_openssl_libs in
- ""|-L*) ;;
- *) with_openssl_libs="-L$with_openssl_libs" ;;
- esac
-
- AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="")
- AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
- [
- LDFLAGS="$LDFLAGS $with_openssl_libs -lssl -lcrypto $DL_LDFLAGS"
- AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
- LDFLAGS="$LDFLAGS_save"
- ])
- if test "x${openssl_libs}" != "xno"; then
- AC_DEFINE(HAVE_OPENSSL)
- AC_DEFINE(HAVE_SSL)
- msg_ssl="yes (OpenSSL)"
- OPENSSL_LDFLAGS="$with_openssl_libs -lssl -lcrypto $DL_LDFLAGS"
- else
- OPENSSL_CFLAGS=""
- OPENSSL_LDFLAGS=""
- fi
- else
- AC_MSG_CHECKING(for OpenSSL libraries)
- AC_MSG_RESULT(no)
- fi
-else
- OPENSSL_CFLAGS=""
- OPENSSL_LDFLAGS=""
-fi
-
-AC_SUBST(OPENSSL_CFLAGS)
-AC_SUBST(OPENSSL_LDFLAGS)
-
##################################################
# Check for gtk-doc.
##################################################