Rocco Rutte:

- move svn revision grabbing to Makefile so that there's no longer a need to re-run configure for it to update
- start to beautify 'muttng -v' output to list all libs w/ version numbers (maybe helps when debuging)
- fix configure to look for one more ncurses header in $pfx/ncurses/ even for ncursesw (for FreeBSD via ports) so that lib and are from the same version
- stop exiting if install can't chgrp dotlock's permissions; just warn instead

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@416 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/Makefile.am b/Makefile.am
index 2ab3042..a71cd55 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ SUBDIRS = m4 po intl doc contrib lib $(IMAP_SUBDIR) $(POP_SUBDIR) $(NNTP_SUBDIR)
 
 bin_SCRIPTS = muttngbug fleang
 
 
 bin_SCRIPTS = muttngbug fleang
 

-BUILT_SOURCES = keymap_defs.h patchlist.c
+BUILT_SOURCES = keymap_defs.h patchlist.c svnrev.h

 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \
 
 bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
 muttng_SOURCES = $(BUILT_SOURCES) \


@@ -125,7 +125,7 @@ mutt_dotlock.c: dotlock.c
        cp $(srcdir)/dotlock.c mutt_dotlock.c
 
 CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \
        cp $(srcdir)/dotlock.c mutt_dotlock.c
 
 CLEANFILES = mutt_dotlock.c stamp-doc-rc makedoc \

-       keymap_alldefs.h keymap_defs.h patchlist.c
+       keymap_alldefs.h keymap_defs.h patchlist.c svnrev.h

 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 


@@ -151,6 +151,13 @@ keymap_alldefs.h: $(srcdir)/OPS $(srcdir)/OPS.PGP $(srcdir)/OPS.MIX $(srcdir)/OP
                $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
                        > keymap_alldefs.h
 
                $(srcdir)/OPS.MIX $(srcdir)/OPS.CRYPT $(srcdir)/OPS.SMIME \
                        > keymap_alldefs.h
 

+svnrev.h:
+       if test -f "$(srcdir)/.svn/entries" ; then \
+         echo "#define MUTTNG_SVNREV \"r`grep revision $(srcdir)/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`\"" > svnrev.h ; \
+       else \
+         echo "#define MUTTNG_SVNREV \"`date "+%Y%m%d"`\"" > svnrev.h ; \
+       fi
+

 reldate:
        echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
 
 reldate:
        echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
 


@@ -165,7 +172,7 @@ install-exec-hook:
        if test -f $(DESTDIR)$(bindir)/muttng_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
                chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/muttng_dotlock && \
                chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/muttng_dotlock || \
        if test -f $(DESTDIR)$(bindir)/muttng_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
                chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/muttng_dotlock && \
                chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/muttng_dotlock || \

-               { echo "Can't fix muttng_dotlock's permissions!" >&2 ; exit 1 ; } \
+               { echo "Can't fix muttng_dotlock's permissions!" >&2 ; } \

        fi
 
 install-data-local: Muttngrc
        fi
 
 install-data-local: Muttngrc

diff --git a/configure.in b/configure.in
index 3cdc118..2215e55 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,13 +7,7 @@ AC_PREREQ([2.50])
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
 
 AC_INIT([mutt.h])
 AM_CONFIG_HEADER(config.h)
 

-if test -f "$srcdir/.svn/entries" ; then
-  echo "`cat $srcdir/VERSION.in`-r`grep revision $srcdir/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`" > "$srcdir/VERSION"
-else
-  cp "$srcdir/VERSION.in" "$srcdir/VERSION"
-fi
-
-mutt_cv_version=`cat "$srcdir/VERSION"`
+mutt_cv_version=`cat "$srcdir/VERSION.in"`

 
 AM_INIT_AUTOMAKE(muttng, $mutt_cv_version)
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])
 
 AM_INIT_AUTOMAKE(muttng, $mutt_cv_version)
 AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION.in'])


@@ -265,6 +259,7 @@ main ()
                 fi
                
                 if test "$cf_ncurses" = ncursesw; then
                 fi
                
                 if test "$cf_ncurses" = ncursesw; then

+                       AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"])

                        AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
                else
                        AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])
                        AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
                else
                        AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])

diff --git a/doc/Makefile.in b/doc/Makefile.in
index c147f1d..8c5a93e 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -172,8 +172,8 @@ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.he
                > muttrc.man
        touch stamp-doc-man
 
                > muttrc.man
        touch stamp-doc-man
 

-manual.sgml stamp-doc-sgml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION
-       ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION`/" $(srcdir)/manual.sgml.head ;\
+manual.sgml stamp-doc-sgml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.sgml.head manual.sgml.tail $(top_srcdir)/VERSION.in
+       ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`/" $(srcdir)/manual.sgml.head ;\

          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
                cat - $(srcdir)/manual.sgml.tail > manual.sgml
        touch stamp-doc-sgml
          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
                cat - $(srcdir)/manual.sgml.tail > manual.sgml
        touch stamp-doc-sgml

diff --git a/main.c b/main.c
index 1a7f4d3..2c522d0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -52,6 +52,28 @@
 #include "nntp/nntp.h"
 #endif
 
 #include "nntp/nntp.h"
 #endif
 

+#ifdef USE_LIBESMTP
+#include <libesmtp.h>
+#endif
+
+#if USE_HCACHE
+#if HAVE_QDBM
+#include <depot.h>
+#elif HAVE_GDBM
+#include <gdbm.h>
+#elif HAVE_DB4
+#include <db.h>
+#endif
+#endif
+
+#ifdef USE_GNUTLS
+#include <gnutls/gnutls.h>
+#endif
+
+#ifdef CRYPT_BACKEND_GPGME
+#include <gpgme/gpgme.h>
+#endif
+

 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
 To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
 static const char *ReachingUs = N_("\
 To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
 To visit the Mutt-ng homepage go to http://www.muttng.org.\n\


@@ -152,6 +174,9 @@ options:\n\
 static void show_version (void)
 {
   struct utsname uts;
 static void show_version (void)
 {
   struct utsname uts;

+#ifdef USE_LIBESMTP
+  char buf[STRING];
+#endif

 
   puts (mutt_make_version ());
   puts (_(Notice));
 
   puts (mutt_make_version ());
   puts (_(Notice));


@@ -159,52 +184,68 @@ static void show_version (void)
   uname (&uts);
 
 #ifdef _AIX
   uname (&uts);
 
 #ifdef _AIX

-  printf ("System: %s %s.%s", uts.sysname, uts.version, uts.release);
+  printf ("System:\n  %s %s.%s", uts.sysname, uts.version, uts.release);

 #elif defined (SCO)
 #elif defined (SCO)

-  printf ("System: SCO %s", uts.release);
+  printf ("System:\n  SCO %s", uts.release);

 #else
 #else

-  printf ("System: %s %s", uts.sysname, uts.release);
+  printf ("System:\n  %s %s", uts.sysname, uts.release);

 #endif
 
 #endif
 

-  printf (" (%s)", uts.machine);
+  printf (" (%s)\nExternal Libraries:\n", uts.machine);

 
 #ifdef NCURSES_VERSION
 
 #ifdef NCURSES_VERSION

-  printf (" [using ncurses %s]", NCURSES_VERSION);
+  printf ("  ncurses %s\n", NCURSES_VERSION);

 #elif defined(USE_SLANG_CURSES)
 #elif defined(USE_SLANG_CURSES)

-  printf (" [using slang %d]", SLANG_VERSION);
+  printf ("  slang %d\n", SLANG_VERSION);

 #endif
 
 #ifdef _LIBICONV_VERSION
 #endif
 
 #ifdef _LIBICONV_VERSION

-  printf (" [using libiconv %d.%d]", _LIBICONV_VERSION >> 8,
+  printf ("  libiconv %d.%d\n", _LIBICONV_VERSION >> 8,

           _LIBICONV_VERSION & 0xff);
 #endif
 
 #ifdef HAVE_LIBIDN
           _LIBICONV_VERSION & 0xff);
 #endif
 
 #ifdef HAVE_LIBIDN

-  printf (" [using libidn %s (compiled with %s)]",
+  printf ("  libidn %s (compiled with %s)\n",

           stringprep_check_version (NULL), STRINGPREP_VERSION);
 #endif
 
           stringprep_check_version (NULL), STRINGPREP_VERSION);
 #endif
 

-  puts (_("\nCompile options:"));
+#ifdef USE_LIBESMTP
+  smtp_version (buf, sizeof (buf), 0);
+  printf ("  libESMTP %s\n", buf);
+#endif

 
 

-#ifdef DOMAIN
-  printf ("DOMAIN=\"%s\"\n", DOMAIN);
-#else
-  puts ("-DOMAIN");
+#if USE_HCACHE
+#if HAVE_QDBM
+  printf ("  qdbm %s\n", dpversion);
+#elif HAVE_GDBM
+  printf ("  gdbm %s\n", gbdm_version);
+#elif HAVE_DB4
+  printf ("  DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
+          DB_VERSION_PATCH);
+#endif

 #endif
 
 #endif
 

-#ifdef DEBUG
-  puts ("+DEBUG");
-#else
-  puts ("-DEBUG");
+#ifdef USE_GNUTLS
+  printf ("  gnutls %s\n", LIBGNUTLS_VERSION);

 #endif
 
 #endif
 

+#ifdef CRYPT_BACKEND_GPGME
+  printf ("  gpgme %s\n", GPGME_VERSION);
+#endif

 
 

+  puts (_("Compile Options:"));
+
+#ifdef DEBUG
+  puts ("  +DEBUG");
+#else
+  puts ("  -DEBUG");
+#endif

 
   puts (
 #ifdef HOMESPOOL
 
   puts (
 #ifdef HOMESPOOL

-         "+HOMESPOOL  "
+         "  +HOMESPOOL  "

 #else
 #else

-         "-HOMESPOOL  "
+         "  -HOMESPOOL  "

 #endif
 #ifdef USE_SETGID
          "+USE_SETGID  "
 #endif
 #ifdef USE_SETGID
          "+USE_SETGID  "


@@ -221,7 +262,7 @@ static void show_version (void)
 #else
          "-DL_STANDALONE  "
 #endif
 #else
          "-DL_STANDALONE  "
 #endif

-         "\n"
+         "\n  "

 #ifdef USE_FCNTL
          "+USE_FCNTL  "
 #else
 #ifdef USE_FCNTL
          "+USE_FCNTL  "
 #else


@@ -245,9 +286,9 @@ static void show_version (void)
     );
   puts (
 #ifdef USE_POP
     );
   puts (
 #ifdef USE_POP

-         "+USE_POP  "
+         "  +USE_POP  "

 #else
 #else

-         "-USE_POP  "
+         "  -USE_POP  "

 #endif
 #ifdef USE_NNTP
          "+USE_NNTP  "
 #endif
 #ifdef USE_NNTP
          "+USE_NNTP  "


@@ -289,7 +330,7 @@ static void show_version (void)
 #else
          "-USE_LIBESMTP  "
 #endif
 #else
          "-USE_LIBESMTP  "
 #endif

-         "\n"
+         "\n  "

 #ifdef HAVE_REGCOMP
          "+HAVE_REGCOMP  "
 #else
 #ifdef HAVE_REGCOMP
          "+HAVE_REGCOMP  "
 #else


@@ -305,7 +346,7 @@ static void show_version (void)
 #else
          "-COMPRESSED  "
 #endif
 #else
          "-COMPRESSED  "
 #endif

-         "\n"
+         "\n  "

 #ifdef HAVE_COLOR
          "+HAVE_COLOR  "
 #else
 #ifdef HAVE_COLOR
          "+HAVE_COLOR  "
 #else


@@ -326,7 +367,7 @@ static void show_version (void)
 #else
          "-HAVE_BKGDSET  "
 #endif
 #else
          "-HAVE_BKGDSET  "
 #endif

-         "\n"
+         "\n  "

 #ifdef HAVE_CURS_SET
          "+HAVE_CURS_SET  "
 #else
 #ifdef HAVE_CURS_SET
          "+HAVE_CURS_SET  "
 #else


@@ -346,9 +387,9 @@ static void show_version (void)
 
   puts (
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
 
   puts (
 #ifdef CRYPT_BACKEND_CLASSIC_PGP

-         "+CRYPT_BACKEND_CLASSIC_PGP  "
+         "  +CRYPT_BACKEND_CLASSIC_PGP  "

 #else
 #else

-         "-CRYPT_BACKEND_CLASSIC_PGP  "
+         "  -CRYPT_BACKEND_CLASSIC_PGP  "

 #endif
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
          "+CRYPT_BACKEND_CLASSIC_SMIME  "
 #endif
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
          "+CRYPT_BACKEND_CLASSIC_SMIME  "


@@ -370,7 +411,7 @@ static void show_version (void)
 #else
          "-SUN_ATTACHMENT  "
 #endif
 #else
          "-SUN_ATTACHMENT  "
 #endif

-         "\n"
+         "\n  "

 #ifdef ENABLE_NLS
          "+ENABLE_NLS  "
 #else
 #ifdef ENABLE_NLS
          "+ENABLE_NLS  "
 #else


@@ -396,7 +437,7 @@ static void show_version (void)
 #else
          "-HAVE_LANGINFO_YESEXPR  "
 #endif
 #else
          "-HAVE_LANGINFO_YESEXPR  "
 #endif

-         "\n"
+         "\n  "

 #if HAVE_ICONV
          "+HAVE_ICONV  "
 #else
 #if HAVE_ICONV
          "+HAVE_ICONV  "
 #else


@@ -424,21 +465,29 @@ static void show_version (void)
 #endif
     );
 
 #endif
     );
 

+  puts (_("Built-In Defaults:"));
+
+#ifdef DOMAIN
+  printf ("  +DOMAIN=\"%s\"\n", DOMAIN);
+#else
+  puts ("  -DOMAIN");
+#endif
+

 #ifdef ISPELL
 #ifdef ISPELL

-  printf ("ISPELL=\"%s\"\n", ISPELL);
+  printf ("  +ISPELL=\"%s\"\n", ISPELL);

 #else
 #else

-  puts ("-ISPELL");
+  puts ("  -ISPELL");

 #endif
 
 #endif
 

-  printf ("SENDMAIL=\"%s\"\n", SENDMAIL);
-  printf ("MAILPATH=\"%s\"\n", MAILPATH);
-  printf ("PKGDATADIR=\"%s\"\n", PKGDATADIR);
-  printf ("SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
-  printf ("EXECSHELL=\"%s\"\n", EXECSHELL);
+  printf ("  +SENDMAIL=\"%s\"\n", SENDMAIL);
+  printf ("  +MAILPATH=\"%s\"\n", MAILPATH);
+  printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
+  printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
+  printf ("  +EXECSHELL=\"%s\"\n", EXECSHELL);

 #ifdef MIXMASTER
 #ifdef MIXMASTER

-  printf ("MIXMASTER=\"%s\"\n", MIXMASTER);
+  printf ("  +MIXMASTER=\"%s\"\n\n", MIXMASTER);

 #else
 #else

-  puts ("-MIXMASTER");
+  puts ("  -MIXMASTER\n");

 #endif
 
   puts (_(ReachingUs));
 #endif
 
   puts (_(ReachingUs));

diff --git a/mutt_curses.h b/mutt_curses.h
index b090e9c..6e75e5d 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -30,13 +30,13 @@
 
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>

-#else
-#ifdef HAVE_NCURSES_H
+#elif HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#elif ifdef HAVE_NCURSES_H

 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif
 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif

-#endif

 
 #define M_ENTER_C '\n'
 #define M_ENTER_S "\n"
 
 #define M_ENTER_C '\n'
 #define M_ENTER_S "\n"

diff --git a/muttlib.c b/muttlib.c
index 7b291a1..c0df6d1 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -23,6 +23,7 @@
 #include "attach.h"
 
 #include "reldate.h"
 #include "attach.h"
 
 #include "reldate.h"

+#include "svnrev.h"

 
 #ifdef USE_IMAP
 #include "imap.h"
 
 #ifdef USE_IMAP
 #include "imap.h"


@@ -1288,8 +1289,8 @@ const char *mutt_make_version (void)
 {
   static char vstring[STRING];
 
 {
   static char vstring[STRING];
 

-  snprintf (vstring, sizeof (vstring), "Mutt-ng %s (based on Mutt 1.5.10/%s)",
-            MUTT_VERSION, ReleaseDate);
+  snprintf (vstring, sizeof (vstring), "Mutt-ng %s-%s (based on Mutt 1.5.10/%s)",
+            MUTT_VERSION, MUTTNG_SVNREV, ReleaseDate);

   return vstring;
 }
 
   return vstring;
 }