commit - 4fdab84f49d3b70a287a1a2d2bb9f589f96e252f
commit + 2dcd5aa0bfe3a60aa917a7805272da71dcd32545
blob - d88bfdc174c210657f0306f3be242db6e4ade599
blob + f12d1a843dceb48ddfcfba4fe297c536ee64091d
--- ChangeLog-gtk2.claws
+++ ChangeLog-gtk2.claws
+2004-08-09 [paul] 0.9.12cvs55.2
+
+ * autogen.sh
+ * po/poconv.sh
+ remove unneeded script
+
+ * configure.ac
+ add forgotten USE_LDAP_TLS (sync with HEAD)
+
+
2004-08-09 [colin] 0.9.12cvs55.1
* src/main.c
blob - ca9cf4605350f6e46ba0001581522a12455b12d4
blob + 2af509475de192738c67f66a5c5c34dfa90d0ccd
--- PATCHSETS
+++ PATCHSETS
( cvs diff -u -r 1.654.2.137 -r 1.654.2.138 configure.ac; cvs diff -u -r 1.213.2.12 -r 1.213.2.13 src/folder.c; ) > 0.9.12cvs51.1.patchset
( cvs diff -u -r 1.396.2.7 -r 1.396.2.8 ChangeLog; cvs diff -u -r 1.2504.2.10 -r 1.2504.2.11 ChangeLog.claws; cvs diff -u -r 1.391.2.7 -r 1.391.2.8 ChangeLog.jp; cvs diff -u -r 1.654.2.138 -r 1.654.2.139 configure.ac; cvs diff -u -r 1.53.2.5 -r 1.53.2.6 po/POTFILES.in; cvs diff -u -r 1.155.2.7 -r 1.155.2.8 src/Makefile.am; cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/folderutils.c; cvs diff -u -r 1.115.2.12 -r 1.115.2.13 src/main.c; cvs diff -u -r -1.10.2.3 -r -1.10.2.4 src/pgpmime.c; cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/pgpmime.h; cvs diff -u -r -1.12.2.4 -r -1.12.2.5 src/sgpgme.c; cvs diff -u -r -1.4.2.2 -r -1.4.2.3 src/sgpgme.h; cvs diff -u -r 1.8 -r 1.9 src/plugins/Makefile.am; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/.cvsignore; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/pgpmime.h; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/plugin.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/sgpgme.h; ) > 0.9.12cvs54.1.patchset
( cvs diff -u -r 1.115.2.13 -r 1.115.2.14 src/main.c; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/common/ssl.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/common/sylpheed.c; cvs diff -u -r 1.5 -r 1.6 src/common/sylpheed.h; ) > 0.9.12cvs55.1.patchset
+( cvs diff -u -r 1.4.2.2 -r 1.4.2.3 autogen.sh; cvs diff -u -r 1.654.2.140 -r 1.654.2.141 configure.ac; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 po/poconv.sh; ) > 0.9.12cvs55.2.patchset
blob - d9fa6ab9e6bebcee2bfae4484a3a0a2f5d1bd547
blob + e252970873d15aa1ad7cdfff33a5face0cda28eb
--- autogen.sh
+++ autogen.sh
#!/bin/sh
-cd po
-/bin/sh poconv.sh
-cd ..
-
autopoint --force \
&& aclocal -I m4 \
&& libtoolize --force --copy \
blob - 924c6870800b9cbd77f57b195744aa21f294203f
blob + ce77e6b0c2b2a1d3a540e201f2f3f1363e99eb0d
--- configure.ac
+++ configure.ac
BINARY_AGE=0
EXTRA_VERSION=55
EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
[ ac_cv_enable_ldap=yes ],
[ ac_cv_enable_ldap=no ],
$LDAP_LIBS)
+
+ AC_CHECK_LIB(ldap, ldap_start_tls_s,
+ [ ac_cv_have_tls=yes ],
+ [ ac_cv_have_tls=no ])
+
fi
AC_MSG_CHECKING([whether ldap library is available])
AC_MSG_RESULT($ac_cv_enable_ldap)
+ AC_MSG_CHECKING([whether TLS library is available])
+ AC_MSG_RESULT($ac_cv_have_tls)
+
if test "$ac_cv_enable_ldap" = yes; then
CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
AC_SUBST(LDAP_LIBS)
+ if test "$ac_cv_have_tls" = yes; then
+ AC_DEFINE(USE_LDAP_TLS, 1, Define if you want LDAP TLS support in addressbook.)
+ fi
fi
else
AC_MSG_RESULT(no)
blob - 93627819c24a5dd12e2ba8634fec228f7c9fb425 (mode 644)
blob + /dev/null
--- po/poconv.sh
+++ /dev/null
-#!/bin/sh
-for pofile in *.po; do
- pocharset=`grep "Content-Type: text/plain; charset" $pofile | sed -e 's/\"Content-Type: text\/plain; charset=\\(.*\\)\\\n\"/\\1/'`
- echo "$pofile:"
- if test -z $pocharset; then
- echo "missing charset!"
- elif test "$pocharset" = "UTF-8"; then
- echo "charset is already UTF-8. skipping..."
- else
- echo -n "converting $pocharset to UTF-8..."
- iconv -f $pocharset -t UTF-8 $pofile > $pofile.utf8
- echo "done!"
- echo -n "Replace charset description to UTF-8..."
- cp $pofile $pofile.bak
- sed -e 's/Content-Type: text\/plain; charset=.*\\n/Content-Type: text\/plain; charset=UTF-8\\n/' < $pofile.utf8 > $pofile
- echo "done!"
- rm $pofile.utf8
- fi
- echo
-done
