From: Pierre Habouzit <madcoder@debian.org>
Date: Sat, 4 Nov 2006 23:02:54 +0000 (+0100)
Subject: --with-domain= is a joke
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=0dd6b2e7a21a844f2dcc306bb2d36096d3f9b664

--with-domain= is a joke

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/configure.ac b/configure.ac
index 465580c..1e879fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,13 +425,6 @@ fi
 AC_SUBST(DOTLOCK_GROUP)
 AC_SUBST(DOTLOCK_PERMISSION)
 
-AC_ARG_WITH(domain, AC_HELP_STRING([--with-domain=DOMAIN], [Specify your DNS domain name]),
-        [if test $withval != yes; then
-         if test $withval != no; then
-           AC_DEFINE_UNQUOTED(DOMAIN,"$withval",[ Define your domain name. ])
-         fi
-        fi])
-
 need_socket="no"
 
 dnl -- socket dependencies --
diff --git a/init.c b/init.c
index 5ad2e22..29e6c5f 100644
--- a/init.c
+++ b/init.c
@@ -2640,15 +2640,12 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   else
     Hostname = m_strdup(utsname.nodename);
 
-#ifndef DOMAIN
-#define DOMAIN buffer
   if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
     Fqdn = m_strdup("@");
   else
-#endif /* DOMAIN */
-  if (*DOMAIN != '@') {
-    Fqdn = p_new(char, m_strlen(DOMAIN) + m_strlen(Hostname) + 2);
-    sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
+  if (*buffer != '@') {
+    Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
+    sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
   }
   else
     Fqdn = m_strdup(NONULL (Hostname));
diff --git a/main.c b/main.c
index 6f318e9..8b3bcb7 100644
--- a/main.c
+++ b/main.c
@@ -458,12 +458,6 @@ static void show_version (void)
 
   puts (_("Built-In Defaults:"));
 
-#ifdef DOMAIN
-  printf ("  +DOMAIN=\"%s\"\n", DOMAIN);
-#else
-  puts ("  -DOMAIN");
-#endif
-
 #ifdef ISPELL
   printf ("  +ISPELL=\"%s\"\n", ISPELL);
 #else