sync with sylpheed 0.6.1cvs2
[claws.git] / configure.in
index 2561cbd..1fd2f12 100644 (file)
@@ -8,13 +8,13 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws
+EXTRA_VERSION=claws1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+dnl AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
@@ -141,27 +141,19 @@ if test "$ac_cv_enable_compface" = yes; then
 fi
 
 dnl for JPilot support in addressbook
-dnl no check for libraries: these are dynamically loaded
+dnl no check for libraries; these are dynamically loaded
 AC_ARG_ENABLE(jpilot,
        [  --enable-jpilot         Enable JPilot support [default=no]],
        [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=no])
-
-AC_MSG_CHECKING([whether to use jpilot])
+AC_MSG_CHECKING([whether to use JPilot])
 if test "$ac_cv_enable_jpilot" = yes; then
        AC_MSG_RESULT(yes)
-       if test "$ac_cv_enable_jpilot" = yes; then
-               AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h, , [ac_cv_enable_jpilot=no])
-               if test "$ac_cv_enable_jpilot" = yes; then              
-                       LIBS="$LIBS -lpisock"
-                       AC_DEFINE(USE_JPILOT)
-               fi
-       fi
-       AC_MSG_CHECKING(whether jpilot is available)
-       if test "$ac_cv_enable_jpilot" = yes; then
-               AC_MSG_RESULT(yes)
-       else
-               AC_MSG_RESULT(no)
-       fi
+       AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h,
+                        [ LIBS="$LIBS -lpisock"
+                          AC_DEFINE(USE_JPILOT) ],
+                        [ ac_cv_enable_jpilot=no ])
+       AC_MSG_CHECKING([whether jpilot is available])
+       AC_MSG_RESULT($ac_cv_enable_jpilot)
 else
        AC_MSG_RESULT(no)
 fi
@@ -169,25 +161,17 @@ fi
 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
-       [  --enable-ldap         Enable LDAP support [default=no]],
+       [  --enable-ldap           Enable LDAP support [default=no]],
        [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
-
-AC_MSG_CHECKING([whether to use ldap])
+AC_MSG_CHECKING([whether to use LDAP])
 if test "$ac_cv_enable_ldap" = yes; then
        AC_MSG_RESULT(yes)
-       if test "$ac_cv_enable_ldap" = yes; then
-               AC_CHECK_HEADERS(ldap.h lber.h pthread.h, , [ac_cv_enable_ldap=no])
-               if test "$ac_cv_enable_ldap" = yes; then
-                       LIBS="$LIBS -lldap -llber -lpthread -lresolv"
-                       AC_DEFINE(USE_LDAP)
-               fi      
-       fi
-       AC_MSG_CHECKING(whether ldap is available)
-       if test "$ac_cv_enable_ldap" = yes; then
-               AC_MSG_RESULT(yes)
-       else
-               AC_MSG_RESULT(no)
-       fi
+       AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
+                        [ LIBS="$LIBS -lldap -llber -lpthread -lresolv"
+                          AC_DEFINE(USE_LDAP) ],
+                        [ ac_cv_enable_ldap=no ])
+       AC_MSG_CHECKING([whether ldap is available])
+       AC_MSG_RESULT($ac_cv_enable_ldap)
 else
        AC_MSG_RESULT(no)
 fi
@@ -341,9 +325,9 @@ echo ""
 echo "gdk-pixbuf : $ac_cv_enable_gdk_pixbuf"
 echo "gdk_imlib  : $ac_cv_enable_imlib"
 echo "GPGME      : $ac_cv_enable_gpgme"
+echo "OpenSSL    : $ac_cv_enable_ssl"
 echo "JPilot     : $ac_cv_enable_jpilot"
 echo "LDAP       : $ac_cv_enable_ldap"
-echo "OpenSSL    : $ac_cv_enable_ssl"
 echo "compface   : $ac_cv_enable_compface"
 echo "libjconv   : $ac_cv_enable_jconv"
 echo "IPv6       : $ac_cv_enable_ipv6"