* acconfig.h ** REMOVED **

* configure.in
* ac/aspell.m4
* ac/check-type.m4
* ac/gnupg-check-typedef.m4
        fix autoheader 2.50 warning

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e0a06280ce076787c0545d10558ae22155108069..e3aa9bb607320dad19baf171ffe4451a0c951e81 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2002-09-29 [christoph] 0.8.3claws35
+
+       * acconfig.h    ** REMOVED **
+       * configure.in
+       * ac/aspell.m4
+       * ac/check-type.m4
+       * ac/gnupg-check-typedef.m4
+               fix autoheader 2.50 warning
+

 2002-09-29 [christoph] 0.8.3claws34
 
        * major code cleanup (part 2)
 2002-09-29 [christoph] 0.8.3claws34
 
        * major code cleanup (part 2)

diff --git a/ac/aspell.m4 b/ac/aspell.m4
index f5c21711e6984d58cf1af86c61b670f5a4c235b3..1d9ae0b1be56d567d1cb4049472490eb3cda6212 100644 (file)
--- a/ac/aspell.m4
+++ b/ac/aspell.m4
@@ -84,7 +84,7 @@ main ()
            AC_MSG_RESULT(yes)
            AC_MSG_CHECKING(for GNU/aspell dictionaries location)
            aspell_path="`$ASPELL config dict-dir`"
            AC_MSG_RESULT(yes)
            AC_MSG_CHECKING(for GNU/aspell dictionaries location)
            aspell_path="`$ASPELL config dict-dir`"

-           AC_DEFINE_UNQUOTED(ASPELL_PATH, "${aspell_path}/")
+           AC_DEFINE_UNQUOTED(ASPELL_PATH, "${aspell_path}/", Define ASPELL's default directory)

            AC_MSG_RESULT($aspell_path)
            AC_MSG_CHECKING(if GNU/aspell is correctly installed)
            ac_save_CFLAGS="$CFLAGS"
            AC_MSG_RESULT($aspell_path)
            AC_MSG_CHECKING(if GNU/aspell is correctly installed)
            ac_save_CFLAGS="$CFLAGS"

diff --git a/ac/check-type.m4 b/ac/check-type.m4
index 1a71b6afe0ccd90f1fc319f6213c7ab2e1b638a3..30dd8a1a1e1325a6f03ef800bb0d7d9236ca7dde 100644 (file)
--- a/ac/check-type.m4
+++ b/ac/check-type.m4
@@ -22,6 +22,6 @@ int a = sizeof($1);
 ], sylpheed_cv_type_$1=yes, sylpheed_cv_type_$1=no)])dnl
 AC_MSG_RESULT($sylpheed_cv_type_$1)
 if test $sylpheed_cv_type_$1 = no; then
 ], sylpheed_cv_type_$1=yes, sylpheed_cv_type_$1=no)])dnl
 AC_MSG_RESULT($sylpheed_cv_type_$1)
 if test $sylpheed_cv_type_$1 = no; then

-  AC_DEFINE($1, $2)
+  AC_DEFINE($1, $2, $4)

 fi
 ])
 fi
 ])

diff --git a/ac/gnupg-check-typedef.m4 b/ac/gnupg-check-typedef.m4
index 9f1d7826e41d3041ad0dec572769d555a4ad0cb6..d910fb07360de2c8f59ebd85419a140b59e6b273 100644 (file)
--- a/ac/gnupg-check-typedef.m4
+++ b/ac/gnupg-check-typedef.m4
@@ -11,7 +11,7 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF,
     ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )])
     AC_MSG_RESULT($gnupg_cv_typedef_$1)
     if test "$gnupg_cv_typedef_$1" = yes; then
     ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )])
     AC_MSG_RESULT($gnupg_cv_typedef_$1)
     if test "$gnupg_cv_typedef_$1" = yes; then

-        AC_DEFINE($2)
+        AC_DEFINE($2, 1, $3)

     fi
   ])
 
     fi
   ])
 

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644 (file)
index 68c39b1..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-
-#undef HAVE_GDK_PIXBUF
-#undef HAVE_GDK_IMLIB
-
-#undef USE_GTKGDK_XIM
-
-/* Whether to use multithread or not  */
-#undef USE_THREADS
-
-/* Define if you want IPv6 support.  */
-#undef INET6
-
-/* Define if you use GPGME to support OpenPGP */
-#undef USE_GPGME
-
-/* Define if you use ASPELL to support spell checking */
-#undef USE_ASPELL
-
-/* Define ASPELL's default directory */
-#undef ASPELL_PATH
-
-/* Define if you use OpenSSL to support SSL */
-#undef USE_SSL
-
-/* Define if you want JPilot support in addressbook.  */
-#undef USE_JPILOT
-
-/* Define if you want LDAP support in addressbook.  */
-#undef USE_LDAP
-
-/* Define to `unsigned int' if <stddef.h> or <wchar.h> doesn't define.  */
-#undef wint_t
-
-/* Used to test for a u32 typedef */
-#undef HAVE_U32_TYPEDEF
-
-/* Pop up crash dialog */
-#undef CRASH_DIALOG 
-
-#undef CLAWS
-
-#undef PACKAGE_DATA_DIR

diff --git a/configure.in b/configure.in
index 4b4d2bc2d55d62b0d69d12117fdea42cc90d520a..d788f59b94df02a2adf933d8dafdad123b135a0f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws34
+EXTRA_VERSION=claws35

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target


@@ -32,7 +32,7 @@ fi
 AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
 
 dnl Claws version
 AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
 
 dnl Claws version

-AC_DEFINE(CLAWS, 1)
+AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)

 
 dnl libtool versioning
 LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
 
 dnl libtool versioning
 LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION


@@ -86,12 +86,12 @@ AC_SUBST(faqdir)
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
   if test "x${prefix}" = "xNONE"; then
 dnl Set PACKAGE_DATA_DIR in config.h.
 if test "x${datadir}" = 'x${prefix}/share'; then
   if test "x${prefix}" = "xNONE"; then

-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)

   else
   else

-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)

   fi
 else
   fi
 else

-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", PACKAGE_DATA_DIR)

 fi
 
 dnl Checks for libraries.
 fi
 
 dnl Checks for libraries.


@@ -111,12 +111,12 @@ AC_ARG_ENABLE(imlib,
 
 if test "$ac_cv_enable_gdk_pixbuf" = yes; then
        AM_PATH_GDK_PIXBUF(0.8.0,
 
 if test "$ac_cv_enable_gdk_pixbuf" = yes; then
        AM_PATH_GDK_PIXBUF(0.8.0,

-               [AC_DEFINE(HAVE_GDK_PIXBUF)
+               [AC_DEFINE(HAVE_GDK_PIXBUF, 1, Use GDK Pixbuf for image rendering)

                 ac_cv_enable_imlib=no], [ac_cv_enable_gdk_pixbuf=no])
 fi
 if test "$ac_cv_enable_imlib" = yes; then
        AM_PATH_GDK_IMLIB(1.9,
                 ac_cv_enable_imlib=no], [ac_cv_enable_gdk_pixbuf=no])
 fi
 if test "$ac_cv_enable_imlib" = yes; then
        AM_PATH_GDK_IMLIB(1.9,

-               AC_DEFINE(HAVE_GDK_IMLIB), [ac_cv_enable_imlib=no])
+               AC_DEFINE(HAVE_GDK_IMLIB, 1, Use GDK Imlib for image rendering), [ac_cv_enable_imlib=no])

 fi
 if test "$ac_cv_enable_gdk_pixbuf" = no -a "$ac_cv_enable_imlib" = no; then
        AC_MSG_WARN(*** Built-in image view will not be supported ***)
 fi
 if test "$ac_cv_enable_gdk_pixbuf" = no -a "$ac_cv_enable_imlib" = no; then
        AC_MSG_WARN(*** Built-in image view will not be supported ***)


@@ -129,8 +129,8 @@ AC_ARG_ENABLE(gpgme,
 AC_MSG_CHECKING([whether to use GPGME])
 if test $ac_cv_enable_gpgme = yes; then
        AC_MSG_RESULT(yes)
 AC_MSG_CHECKING([whether to use GPGME])
 if test $ac_cv_enable_gpgme = yes; then
        AC_MSG_RESULT(yes)

-       AM_PATH_GPGME(0.3.5, AC_DEFINE(USE_GPGME), [use_gpgme=no
-                                                   ac_cv_enable_gpgme=no])
+       AM_PATH_GPGME(0.3.5, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP),
+                     [use_gpgme=no ac_cv_enable_gpgme=no])

 else
        AC_MSG_RESULT(no)
 fi
 else
        AC_MSG_RESULT(no)
 fi


@@ -144,12 +144,12 @@ 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,
 if test "$ac_cv_enable_jpilot" = yes; then
        AC_MSG_RESULT(yes)
        AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h,

-                        [ AC_DEFINE(USE_JPILOT) ],
+                        [ AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ],

                         [ 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,
                                 [ ac_cv_enable_jpilot=yes
                         [ 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,
                                 [ ac_cv_enable_jpilot=yes

-                                  AC_DEFINE(USE_JPILOT) ])
+                                  AC_DEFINE(USE_JPILOT, 1) ])

        fi
        AC_MSG_CHECKING([whether jpilot is available])
        AC_MSG_RESULT($ac_cv_enable_jpilot)
        fi
        AC_MSG_CHECKING([whether jpilot is available])
        AC_MSG_RESULT($ac_cv_enable_jpilot)


@@ -191,7 +191,7 @@ if test "$ac_cv_enable_ldap" = yes; then
                                ac_cv_enable_ldap=yes
                                CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
                                LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
                                ac_cv_enable_ldap=yes
                                CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
                                LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"

-                               AC_DEFINE(USE_LDAP)
+                               AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)

                                AC_SUBST(LDAP_LIBS)
                                ], 
                                [ ac_cv_enable_ldap=no ], $LDAP_LIBS )
                                AC_SUBST(LDAP_LIBS)
                                ], 
                                [ ac_cv_enable_ldap=no ], $LDAP_LIBS )


@@ -215,7 +215,7 @@ if test $ac_cv_enable_ssl = yes; then
 #include <openssl/opensslv.h>
 ],     [ return OPENSSL_VERSION_NUMBER; ],
        [ AC_MSG_RESULT(yes)
 #include <openssl/opensslv.h>
 ],     [ return OPENSSL_VERSION_NUMBER; ],
        [ AC_MSG_RESULT(yes)

-         AC_DEFINE(USE_SSL) ],
+         AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL) ],

        [ AC_MSG_RESULT(no)
          LIBS="$ac_save_LIBS"
          ac_cv_enable_ssl=no ])
        [ AC_MSG_RESULT(no)
          LIBS="$ac_save_LIBS"
          ac_cv_enable_ssl=no ])


@@ -252,7 +252,7 @@ if test x"$use_threads" = xyes ; then
        if test ! -z `$GLIB_CONFIG --help 2>&1 |grep 'gthread'` ; then
                CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
                LIBS="$LIBS `$GLIB_CONFIG --libs gthread`"
        if test ! -z `$GLIB_CONFIG --help 2>&1 |grep 'gthread'` ; then
                CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
                LIBS="$LIBS `$GLIB_CONFIG --libs gthread`"

-               AC_DEFINE(USE_THREADS)
+               AC_DEFINE(USE_THREADS, 1, Whether to use multithread or not)

        else
                AC_MSG_ERROR([Sylpheed requires GThread from GLib to use threading.])
        fi
        else
                AC_MSG_ERROR([Sylpheed requires GThread from GLib to use threading.])
        fi


@@ -279,7 +279,7 @@ if test x"$ac_cv_enable_ipv6" = xyes; then
        ])
        AC_MSG_RESULT($ac_cv_ipv6)
        if test $ac_cv_ipv6 = yes; then
        ])
        AC_MSG_RESULT($ac_cv_ipv6)
        if test $ac_cv_ipv6 = yes; then

-               AC_DEFINE(INET6)
+               AC_DEFINE(INET6, 1, Define if you want IPv6 support.)

        else
                AC_MSG_WARN(*** IPv6 will not be supported ***)
                ac_cv_enable_ipv6=no
        else
                AC_MSG_WARN(*** IPv6 will not be supported ***)
                ac_cv_enable_ipv6=no


@@ -295,8 +295,8 @@ AC_ARG_ENABLE(aspell,
 AC_MSG_CHECKING([whether to use GNU/aspell])
 if test $ac_cv_enable_aspell = yes; then
        AC_MSG_RESULT(yes)
 AC_MSG_CHECKING([whether to use GNU/aspell])
 if test $ac_cv_enable_aspell = yes; then
        AC_MSG_RESULT(yes)

-       AM_PATH_ASPELL(0.50, AC_DEFINE(USE_ASPELL), [use_aspell=no
-                                                   ac_cv_enable_aspell=no])
+       AM_PATH_ASPELL(0.50, AC_DEFINE(USE_ASPELL, 1, Define if you use ASPELL to support spell checking),
+                     [use_aspell=no ac_cv_enable_aspell=no])

 else
        AC_MSG_RESULT(no)
 fi
 else
        AC_MSG_RESULT(no)
 fi


@@ -313,7 +313,7 @@ AC_CACHE_VAL(ac_cv_use_gtkgdk_xim, [
        ])
 AC_MSG_RESULT($ac_cv_use_gtkgdk_xim)
 if test $ac_cv_use_gtkgdk_xim = yes; then
        ])
 AC_MSG_RESULT($ac_cv_use_gtkgdk_xim)
 if test $ac_cv_use_gtkgdk_xim = yes; then

-       AC_DEFINE(USE_GTKGDK_XIM)
+       AC_DEFINE(USE_GTKGDK_XIM, 1, USE_GTKGDK_XIM)

 fi
 CFLAGS="$CFLAGS_SAVE"
 LDFLAGS="$LDFLAGS_SAVE"
 fi
 CFLAGS="$CFLAGS_SAVE"
 LDFLAGS="$LDFLAGS_SAVE"


@@ -327,7 +327,7 @@ dnl check if GDB is somewhere
        AC_CHECK_PROG(ac_cv_enable_crash_dialog, gdb, yes, no)
        AC_MSG_CHECKING([whether to use crash dialog])
        if test $ac_cv_enable_crash_dialog = yes; then
        AC_CHECK_PROG(ac_cv_enable_crash_dialog, gdb, yes, no)
        AC_MSG_CHECKING([whether to use crash dialog])
        if test $ac_cv_enable_crash_dialog = yes; then

-               AC_DEFINE(CRASH_DIALOG)
+               AC_DEFINE(CRASH_DIALOG, 1, Pop up crash dialog)

        fi
        AC_MSG_RESULT($ac_cv_enable_crash_dialog)
 fi
        fi
        AC_MSG_RESULT($ac_cv_enable_crash_dialog)
 fi


@@ -355,9 +355,9 @@ SYLPHEED_CHECK_TYPE(wint_t, unsigned int,
 #if HAVE_WCHAR_H
 #include <wchar.h>
 #endif
 #if HAVE_WCHAR_H
 #include <wchar.h>
 #endif

-])
+], Define to `unsigned int' if <stddef.h> or <wchar.h> doesn't define.)

 
 

-GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
+GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF, Used to test for a u32 typedef)

 AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)
 AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)