2006-10-21 [paul] 2.5.6cvs4

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b7283c1ca76170754e6702f3d539118d636912cb..17ee5d9cfe0b23e8d70fa45c946615dcf15f711a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=2
 MINOR_VERSION=5
-MICRO_VERSION=2
+MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -196,6 +196,29 @@ fi
 
 AC_CHECK_LIB(xpg4, setlocale)
 
+SM_LIBS=""
+dnl Check for LibSM
+AC_ARG_ENABLE(libsm,
+       [  --disable-libsm    Do not use libSM for session management.],
+       [ac_cv_enable_libsm=$enableval], [ac_cv_enable_libsm=yes])
+AC_MSG_CHECKING([whether to use LibSM])
+if test x"$ac_cv_enable_libsm" = xyes; then
+       AC_MSG_RESULT(yes)
+       AC_CHECK_LIB(SM, SmcSaveYourselfDone,
+               [SM_LIBS="$X_LIBS -lSM -lICE"],ac_cv_enable_libsm=no,
+               $X_LIBS -lICE)
+       AC_CHECK_HEADERS(X11/SM/SMlib.h,,ac_cv_enable_libsm=no)
+       if test x"$ac_cv_enable_libsm" = xyes; then
+               AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
+       else
+               AC_MSG_RESULT(not found)
+               AC_MSG_WARN([*** LibSM will not be supported ***])
+       fi
+else
+       AC_MSG_RESULT(no)
+fi
+AC_SUBST(SM_LIBS)
+
 dnl for GThread support (currently disabled)
 dnl AC_ARG_ENABLE(threads,
 dnl    [  --enable-threads        Enable multithread support [default=no]],
@@ -279,6 +302,8 @@ AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr strchr \
               uname flock lockf inet_aton inet_addr \
               fchmod mkstemp truncate getuid regcomp)
 
+AC_CHECK_FUNCS(fgets_unlocked fwrite_unlocked)
+
 dnl *****************
 dnl ** common code **
 dnl *****************
@@ -767,18 +792,18 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
-          if test "$LIBETPAN_VERSION" -lt "046"; then
-               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.46 or newer. See http://www.etpan.org/])
+          if test "$LIBETPAN_VERSION" -lt "047"; then
+               AC_MSG_RESULT([*** Sylpheed requires libetpan 0.47 or newer. See http://www.etpan.org/])
                AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
-                AC_MSG_ERROR([libetpan 0.46 not found])
+                AC_MSG_ERROR([libetpan 0.47 not found])
           fi
           AC_SUBST(LIBETPAN_FLAGS)
           AC_SUBST(LIBETPAN_LIBS)
           AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
        else
-          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.46 or newer. See http://www.etpan.org/ ])
+          AC_MSG_RESULT([*** Sylpheed requires libetpan 0.47 or newer. See http://www.etpan.org/ ])
           AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
-           AC_MSG_ERROR([libetpan 0.46 not found])
+           AC_MSG_ERROR([libetpan 0.47 not found])
        fi
 else
        AC_MSG_RESULT(no)
@@ -878,6 +903,7 @@ echo "GNU/aspell    : $ac_cv_enable_aspell"
 echo "IMAP4         : $ac_cv_enable_libetpan"
 echo "Crash dialog  : $ac_cv_enable_crash_dialog"
 echo "Libgnomeprint : $ac_cv_enable_gnomeprint"
+echo "LibSM         : $ac_cv_enable_libsm"
 echo "Manual        : $ac_cv_enable_manual"
 echo "Plugins       : $PLUGINS"
 echo "Config dir    : $ac_cv_with_config_dir"