Andreas Krennmair:

	changed mutt to muttng, .muttrc to .muttngrc and Muttrc to Muttngrc to make it possible to have mutt and mutt-ng installed at the same time with different configurations

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

diff --git a/Makefile.am b/Makefile.am
index 3e05525..cee228c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,8 @@ bin_SCRIPTS = muttbug flea
 
 BUILT_SOURCES = keymap_defs.h patchlist.c
 
 
 BUILT_SOURCES = keymap_defs.h patchlist.c
 

-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-mutt_SOURCES = $(BUILT_SOURCES) \
+bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
+muttng_SOURCES = $(BUILT_SOURCES) \

        addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
         crypt.c cryptglue.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
        addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
         crypt.c cryptglue.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \


@@ -30,10 +30,10 @@ mutt_SOURCES = $(BUILT_SOURCES) \
        muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
        url.c ascii.c mutt_idna.c sidebar.c
 
        muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \
        url.c ascii.c mutt_idna.c sidebar.c
 

-mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \

        $(INTLLIBS) $(LIBICONV)
 
        $(INTLLIBS) $(LIBICONV)
 

-mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \

        $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c
        $(INTLDEPS)
 
 makedoc_SOURCES = makedoc.c


@@ -58,7 +58,7 @@ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 
 CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 
 

-EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
+EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \

        mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
        pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
        browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
        mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
        pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
        browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \

diff --git a/Makefile.in b/Makefile.in
index 3367db6..471b758 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -194,8 +194,8 @@ bin_SCRIPTS = muttbug flea
 
 BUILT_SOURCES = keymap_defs.h patchlist.c
 
 
 BUILT_SOURCES = keymap_defs.h patchlist.c
 

-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-mutt_SOURCES = $(BUILT_SOURCES) \
+bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
+muttng_SOURCES = $(BUILT_SOURCES) \

        addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
         crypt.c cryptglue.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
        addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
         crypt.c cryptglue.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \


@@ -210,11 +210,11 @@ mutt_SOURCES = $(BUILT_SOURCES) \
        url.c ascii.c mutt_idna.c sidebar.c
 
 
        url.c ascii.c mutt_idna.c sidebar.c
 
 

-mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \

        $(INTLLIBS) $(LIBICONV)
 
 
        $(INTLLIBS) $(LIBICONV)
 
 

-mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \
+muttng_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAPDEPS) \

        $(INTLDEPS)
 
 
        $(INTLDEPS)
 
 


@@ -224,7 +224,7 @@ makedoc_DEPENDENCIES =
 
 INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
 
 
 INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
 

-EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
+EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \

        mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
        pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
        browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
        mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
        pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
        browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \


@@ -271,15 +271,18 @@ CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = intl/Makefile doc/Makefile contrib/Makefile \
        muttbug.sh Muttrc.head doc/instdoc.sh
 EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) makedoc$(EXEEXT)
 CONFIG_CLEAN_FILES = intl/Makefile doc/Makefile contrib/Makefile \
        muttbug.sh Muttrc.head doc/instdoc.sh
 EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) makedoc$(EXEEXT)

-bin_PROGRAMS = mutt$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \
+bin_PROGRAMS = muttng$(EXEEXT) @DOTLOCK_TARGET@ @PGPAUX_TARGET@ \

        @SMIMEAUX_TARGET@
 PROGRAMS = $(bin_PROGRAMS)
 
 am_makedoc_OBJECTS = makedoc.$(OBJEXT)
 makedoc_OBJECTS = $(am_makedoc_OBJECTS)
 makedoc_LDFLAGS =
        @SMIMEAUX_TARGET@
 PROGRAMS = $(bin_PROGRAMS)
 
 am_makedoc_OBJECTS = makedoc.$(OBJEXT)
 makedoc_OBJECTS = $(am_makedoc_OBJECTS)
 makedoc_LDFLAGS =

+am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
+mutt_dotlock_OBJECTS = $(am_mutt_dotlock_OBJECTS)
+mutt_dotlock_LDFLAGS =

 am__objects_1 = patchlist.$(OBJEXT)
 am__objects_1 = patchlist.$(OBJEXT)

-am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \
+am_muttng_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \

        attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
        buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \
        cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \
        attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
        buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \
        cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \


@@ -300,11 +303,8 @@ am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \
        lib.$(OBJEXT) muttlib.$(OBJEXT) editmsg.$(OBJEXT) \
        utf8.$(OBJEXT) mbyte.$(OBJEXT) wcwidth.$(OBJEXT) url.$(OBJEXT) \
        ascii.$(OBJEXT) mutt_idna.$(OBJEXT) sidebar.$(OBJEXT)
        lib.$(OBJEXT) muttlib.$(OBJEXT) editmsg.$(OBJEXT) \
        utf8.$(OBJEXT) mbyte.$(OBJEXT) wcwidth.$(OBJEXT) url.$(OBJEXT) \
        ascii.$(OBJEXT) mutt_idna.$(OBJEXT) sidebar.$(OBJEXT)

-mutt_OBJECTS = $(am_mutt_OBJECTS)
-mutt_LDFLAGS =
-am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
-mutt_dotlock_OBJECTS = $(am_mutt_dotlock_OBJECTS)
-mutt_dotlock_LDFLAGS =
+muttng_OBJECTS = $(am_muttng_OBJECTS)
+muttng_LDFLAGS =

 am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) lib.$(OBJEXT) \
        extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \
        pgppacket.$(OBJEXT) ascii.$(OBJEXT)
 am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) lib.$(OBJEXT) \
        extlib.$(OBJEXT) sha1.$(OBJEXT) md5c.$(OBJEXT) \
        pgppacket.$(OBJEXT) ascii.$(OBJEXT)


@@ -320,8 +320,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

-DIST_SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) \
-       $(mutt_dotlock_SOURCES) $(pgpring_SOURCES)
+DIST_SOURCES = $(makedoc_SOURCES) $(mutt_dotlock_SOURCES) \
+       $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(pgpring_SOURCES)

 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
        ps-recursive install-info-recursive uninstall-info-recursive \
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
        ps-recursive install-info-recursive uninstall-info-recursive \


@@ -334,7 +334,7 @@ DIST_COMMON = README ABOUT-NLS ChangeLog INSTALL Makefile.am \
        depcomp install-sh missing mkinstalldirs muttbug.sh.in regex.c \
        snprintf.c strcasecmp.c strdup.c
 DIST_SUBDIRS = m4 po intl doc contrib imap
        depcomp install-sh missing mkinstalldirs muttbug.sh.in regex.c \
        snprintf.c strcasecmp.c strdup.c
 DIST_SUBDIRS = m4 po intl doc contrib imap

-SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) $(pgpring_SOURCES)
+SOURCES = $(makedoc_SOURCES) $(mutt_dotlock_SOURCES) $(muttng_SOURCES) $(EXTRA_muttng_SOURCES) $(pgpring_SOURCES)

 
 all: $(BUILT_SOURCES) config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 all: $(BUILT_SOURCES) config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive


@@ -411,12 +411,12 @@ clean-binPROGRAMS:
 makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) 
        @rm -f makedoc$(EXEEXT)
        $(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
 makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) 
        @rm -f makedoc$(EXEEXT)
        $(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)

-mutt$(EXEEXT): $(mutt_OBJECTS) $(mutt_DEPENDENCIES) 
-       @rm -f mutt$(EXEEXT)
-       $(LINK) $(mutt_LDFLAGS) $(mutt_OBJECTS) $(mutt_LDADD) $(LIBS)

 mutt_dotlock$(EXEEXT): $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES) 
        @rm -f mutt_dotlock$(EXEEXT)
        $(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS)
 mutt_dotlock$(EXEEXT): $(mutt_dotlock_OBJECTS) $(mutt_dotlock_DEPENDENCIES) 
        @rm -f mutt_dotlock$(EXEEXT)
        $(LINK) $(mutt_dotlock_LDFLAGS) $(mutt_dotlock_OBJECTS) $(mutt_dotlock_LDADD) $(LIBS)

+muttng$(EXEEXT): $(muttng_OBJECTS) $(muttng_DEPENDENCIES) 
+       @rm -f muttng$(EXEEXT)
+       $(LINK) $(muttng_LDFLAGS) $(muttng_OBJECTS) $(muttng_LDADD) $(LIBS)

 pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) 
        @rm -f pgpring$(EXEEXT)
        $(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS)
 pgpring$(EXEEXT): $(pgpring_OBJECTS) $(pgpring_DEPENDENCIES) 
        @rm -f pgpring$(EXEEXT)
        $(LINK) $(pgpring_LDFLAGS) $(pgpring_OBJECTS) $(pgpring_LDADD) $(LIBS)

diff --git a/init.c b/init.c
index dc28df0..cbc9645 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2089,13 +2089,13 @@ void mutt_init (int skip_sys_rc, LIST *commands)
   
   if (!Muttrc)
   {
   
   if (!Muttrc)
   {

-    snprintf (buffer, sizeof(buffer), "%s/.muttrc-%s", NONULL(Homedir), MUTT_VERSION);
+    snprintf (buffer, sizeof(buffer), "%s/.muttngrc-%s", NONULL(Homedir), MUTT_VERSION);

     if (access(buffer, F_OK) == -1)
     if (access(buffer, F_OK) == -1)

-      snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(Homedir));
+      snprintf (buffer, sizeof(buffer), "%s/.muttngrc", NONULL(Homedir));

     if (access(buffer, F_OK) == -1)
     if (access(buffer, F_OK) == -1)

-      snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s", NONULL(Homedir), MUTT_VERSION);
+      snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc-%s", NONULL(Homedir), MUTT_VERSION);

     if (access(buffer, F_OK) == -1)
     if (access(buffer, F_OK) == -1)

-      snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc", NONULL(Homedir));
+      snprintf (buffer, sizeof (buffer), "%s/.muttng/muttngrc", NONULL(Homedir));

     
     default_rc = 1;
     Muttrc = safe_strdup (buffer);
     
     default_rc = 1;
     Muttrc = safe_strdup (buffer);


@@ -2114,13 +2114,13 @@ void mutt_init (int skip_sys_rc, LIST *commands)
      requested not to via "-n".  */
   if (!skip_sys_rc)
   {
      requested not to via "-n".  */
   if (!skip_sys_rc)
   {

-    snprintf (buffer, sizeof(buffer), "%s/Muttrc-%s", SYSCONFDIR, MUTT_VERSION);
+    snprintf (buffer, sizeof(buffer), "%s/Muttngrc-%s", SYSCONFDIR, MUTT_VERSION);

     if (access (buffer, F_OK) == -1)
     if (access (buffer, F_OK) == -1)

-      snprintf (buffer, sizeof(buffer), "%s/Muttrc", SYSCONFDIR);
+      snprintf (buffer, sizeof(buffer), "%s/Muttngrc", SYSCONFDIR);

     if (access (buffer, F_OK) == -1)
     if (access (buffer, F_OK) == -1)

-      snprintf (buffer, sizeof (buffer), "%s/Muttrc-%s", PKGDATADIR, MUTT_VERSION);
+      snprintf (buffer, sizeof (buffer), "%s/Muttngrc-%s", PKGDATADIR, MUTT_VERSION);

     if (access (buffer, F_OK) == -1)
     if (access (buffer, F_OK) == -1)

-      snprintf (buffer, sizeof (buffer), "%s/Muttrc", PKGDATADIR);
+      snprintf (buffer, sizeof (buffer), "%s/Muttngrc", PKGDATADIR);

     if (access (buffer, F_OK) != -1)
     {
       if (source_rc (buffer, &err) != 0)
     if (access (buffer, F_OK) != -1)
     {
       if (source_rc (buffer, &err) != 0)

diff --git a/muttbug.sh.in b/muttbug.sh.in
index df65431..d3a135d 100644 (file)
--- a/muttbug.sh.in
+++ b/muttbug.sh.in
@@ -272,7 +272,7 @@ if test "$CORE" && test -f "$CORE" ; then
 fi
 
 if test "$personal" = "yes" ; then
 fi
 
 if test "$personal" = "yes" ; then

-       CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc"
+       CANDIDATES=".muttngrc-${MUTTVERSION} .muttngrc .muttng/muttngrc-${MUTTVERSION} .muttng/muttngrc"

        MATCHED="none"
        for f in $CANDIDATES; do
                if test -f "${HOME}/$f" ; then
        MATCHED="none"
        for f in $CANDIDATES; do
                if test -f "${HOME}/$f" ; then


@@ -282,7 +282,7 @@ if test "$personal" = "yes" ; then
        done
        
        if test "$MATCHED" = "none" ; then
        done
        
        if test "$MATCHED" = "none" ; then

-               echo "Warning: Can't find your personal .muttrc." >&2
+               echo "Warning: Can't find your personal .muttngrc." >&2

        else
                include_file $MATCHED
        fi
        else
                include_file $MATCHED
        fi


@@ -290,7 +290,7 @@ fi
 
 
 if test "$global" = "yes" ; then
 
 
 if test "$global" = "yes" ; then

-       CANDIDATES="Muttrc-${MUTTVERSION} Muttrc"
+       CANDIDATES="Muttngrc-${MUTTVERSION} Muttngrc"

        DIRECTORIES="$sysconfdir $pkgdatadir"
        MATCHED="none"
        for d in $DIRECTORIES ; do
        DIRECTORIES="$sysconfdir $pkgdatadir"
        MATCHED="none"
        for d in $DIRECTORIES ; do


@@ -304,7 +304,7 @@ if test "$global" = "yes" ; then
        done
        
        if test "$MATCHED" = "none" ; then
        done
        
        if test "$MATCHED" = "none" ; then

-               echo "Warning: Can't find global Muttrc." >&2
+               echo "Warning: Can't find global Muttngrc." >&2

        else
                include_file $MATCHED
        fi
        else
                include_file $MATCHED
        fi