gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sync with sylpheed 0.7.0cvs8

Browse source
This commit is contained in:
Paul Mangan 2002-01-18 10:02:21 +00:00
parent fef6e2c8b7
commit 7c438b507d
4 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2002-01-18
* configure.in: support Mac OS X (Darwin).
2002-01-16
* src/prefs_filter.c: use inc_(un)lock() instead of

5
ChangeLog.claws
View file

@ -1,3 +1,8 @@
2002-01-18 [paul] 0.7.0claws13
* sync with sylpheed 0.7.0cvs8
configure.in: support Mac OS X (Darwin)
2002-01-18 [carsten] 0.7.0claws12
* src/html.c
small hack to fix a segfault with an empty href

4
ChangeLog.jp
View file

@ -1,3 +1,7 @@
2002-01-18
* configure.in: Mac OS X (Darwin) に滦炳。
2002-01-16
* src/prefs_filter.c: inc_autocheck_timer_{remove|set}() の代わりに

31
configure.in
View file

@ -8,9 +8,12 @@ MINOR_VERSION=7
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=claws12
EXTRA_VERSION=claws13
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
AC_CANONICAL_SYSTEM
dnl
AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
@ -54,12 +57,18 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_CPP
dnl AC_PROG_RANLIB
AM_PROG_LIBTOOL
AM_PROG_LEX
AC_PROG_YACC
AM_PROG_LIBTOOL
SYLPHEED_ACLOCAL_INCLUDE(ac)
case "$target" in
*-darwin*)
CFLAGS="$CFLAGS -traditional-cpp -fno-common"
;;
esac
dnl for gettext
ALL_LINGUAS="cs de el es fr hr it ja ko nl pl pt_BR ru sv"
AM_GNU_GETTEXT
@ -149,17 +158,19 @@ AC_MSG_CHECKING([whether to use JPilot])
if test "$ac_cv_enable_jpilot" = yes; then
AC_MSG_RESULT(yes)
AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h,
[ LIBS="$LIBS -lpisock"
AC_DEFINE(USE_JPILOT) ],
[ AC_DEFINE(USE_JPILOT) ],
[ ac_cv_enable_jpilot=no ])
if test "$ac_cv_enable_jpilot" = no; then
AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h,
[ LIBS="$LIBS -lpisock"
ac_cv_enable_jpilot=yes
[ ac_cv_enable_jpilot=yes
AC_DEFINE(USE_JPILOT) ])
fi
AC_MSG_CHECKING([whether jpilot is available])
AC_MSG_RESULT($ac_cv_enable_jpilot)
if test "$ac_cv_enable_jpilot" = yes; then
LIBS="$LIBS -lpisock"
fi
else
AC_MSG_RESULT(no)
fi
@ -173,11 +184,15 @@ AC_MSG_CHECKING([whether to use LDAP])
if test "$ac_cv_enable_ldap" = yes; then
AC_MSG_RESULT(yes)
AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
[ LIBS="$LIBS -lldap -llber -lpthread -lresolv `glib-config --libs gthread`"
AC_DEFINE(USE_LDAP) ],
[ AC_DEFINE(USE_LDAP) ],
[ ac_cv_enable_ldap=no ])
AC_MSG_CHECKING([whether ldap is available])
AC_MSG_RESULT($ac_cv_enable_ldap)
if test "$ac_cv_enable_ldap" = yes; then
CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
LIBS="$LIBS -lldap -llber -lpthread -lresolv `$GLIB_CONFIG --libs gthread`"
fi
else
AC_MSG_RESULT(no)
fi