Various build fixes.

diff --git a/Makefile.am b/Makefile.am
index f4b9974914a6a8f54de2c19cfcdd39de89d19c0e..d9653c0925f26c687a1cb327d49b89bc09007b3f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,10 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO acconfig.h attach.h \
 
 BUILT_SOURCES = mutt_dotlock.c keymap_defs.h
 
+mutt_dotlock_SOURCES = mutt_dotlock.c
+mutt_dotlock_LDADD = @SNPRINTFOBJS@
+mutt_dotlock_DEPENDENCIES = @SNPRINTFOBJS@ @LIBOBJS@ $(INTLDEPS)
+
 mutt_dotlock.c: dotlock.c
        cp dotlock.c mutt_dotlock.c
 

diff --git a/Makefile.in b/Makefile.in
index 87cb1b8507bd9400ceb8501c4e17f497c0f04d2f..7317fa9c8858e38ed8ebac2e7ab86b15052f94a7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,6 +137,10 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO acconfig.h attach.h \
 
 BUILT_SOURCES = mutt_dotlock.c keymap_defs.h
 
+mutt_dotlock_SOURCES = mutt_dotlock.c
+mutt_dotlock_LDADD = @SNPRINTFOBJS@
+mutt_dotlock_DEPENDENCIES = @SNPRINTFOBJS@ @LIBOBJS@ $(INTLDEPS)
+
 CLEANFILES = mutt_dotlock.c
 
 LDADD = @LIBOBJS@ @INTLLIBS@
@@ -153,10 +157,7 @@ PROGRAMS =  $(bin_PROGRAMS)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-mutt_dotlock_SOURCES = mutt_dotlock.c
 mutt_dotlock_OBJECTS =  mutt_dotlock.o
-mutt_dotlock_LDADD = $(LDADD)
-mutt_dotlock_DEPENDENCIES =  @LIBOBJS@
 mutt_dotlock_LDFLAGS = 
 mutt_OBJECTS =  addrbook.o alias.o attach.o browser.o buffy.o color.o \
 commands.o complete.o compose.o copy.o curs_lib.o curs_main.o date.o \
@@ -196,8 +197,8 @@ DEP_FILES =  .deps/addrbook.P .deps/alias.P .deps/attach.P \
 .deps/sha1dgst.P .deps/signal.P .deps/snprintf.P .deps/socket.P \
 .deps/sort.P .deps/status.P .deps/strcasecmp.P .deps/system.P \
 .deps/thread.P
-SOURCES = mutt_dotlock.c $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
-OBJECTS = mutt_dotlock.o $(mutt_OBJECTS)
+SOURCES = $(mutt_dotlock_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES)
+OBJECTS = $(mutt_dotlock_OBJECTS) $(mutt_OBJECTS)
 
 all: all-recursive-am all-am
 

diff --git a/config.h.in b/config.h.in
index 89ea96fb1c21ec6c6f7c93399d2febe55d2334fa..ea7c037c35e6af3f219aac3a79e4ed490c595496 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -275,6 +275,9 @@
 /* Define if you have the <argz.h> header file.  */
 #undef HAVE_ARGZ_H
 
+/* Define if you have the <getopt.h> header file.  */
+#undef HAVE_GETOPT_H
+
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 

diff --git a/configure b/configure
index 778f93e6622af6b4fed038b7fc34e67a3aff51d5..d5758b07f45c6618999c9a282946e9e45bd79b96 100755 (executable)
--- a/configure
+++ b/configure
@@ -1927,7 +1927,7 @@ EOF
 fi
 
 
-for ac_hdr in stdarg.h sys/ioctl.h sysexits.h
+for ac_hdr in stdarg.h sys/ioctl.h sysexits.h getopt.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index be24389e770fe42423f7ef4be23088eefd285dc4..0504278126f73ee2897871b862b33ff2c5574857 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -180,7 +180,7 @@ main ()
 
 AC_HEADER_STDC
 
-AC_CHECK_HEADERS(stdarg.h sys/ioctl.h sysexits.h)
+AC_CHECK_HEADERS(stdarg.h sys/ioctl.h sysexits.h getopt.h)
 
 AC_TYPE_SIGNAL
 

diff --git a/dotlock.c b/dotlock.c
index 0410f0842813763abdcdfa7d29588322afcf7e2d..1d1c485f6a17063ff716490ed812a5618c0cbe3e 100644 (file)
--- a/dotlock.c
+++ b/dotlock.c
@@ -29,6 +29,10 @@ static char rcsid[]="$Id$";
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/file.h>

diff --git a/main.c b/main.c
index f6278a1a6b729bf7d481a6b03b889c8c5ea2941a..249dbc6d85ad26bbdc16fa628fc4b6de138256bb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,6 +33,10 @@ static char rcsid[]="$Id$";
 #include <sys/stat.h>
 #include <sys/utsname.h>
 
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
 const char ReachingUs[] = N_("\
 To contact the developers, please mail to <mutt-dev@mutt.org>.\n");
 

diff --git a/po/mutt.pot b/po/mutt.pot
index 2fbd9bd41a353d4f0a97e4b98ae876e175da6288..511ce7df272b204f95b1ec5b818cf40eb34ca578 100644 (file)
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-14 00:57+0200\n"
+"POT-Creation-Date: 1998-10-14 11:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1788,11 +1788,11 @@ msgstr ""
 msgid "Append messages to %s?"
 msgstr ""
 
-#: main.c:36
+#: main.c:40
 msgid "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
 msgstr ""
 
-#: main.c:39
+#: main.c:43
 msgid ""
 "Copyright (C) 1996-8 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
@@ -1800,7 +1800,7 @@ msgid ""
 "under certain conditions; type `mutt -vv' for details.\n"
 msgstr ""
 
-#: main.c:45
+#: main.c:49
 msgid ""
 "Copyright (C) 1996-8 Michael R. Elkins <me@cs.hmc.edu>\n"
 "Copyright (C) 1997-8 Thomas Roessler <roessler@guug.de>\n"
@@ -1822,7 +1822,7 @@ msgid ""
 "    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n"
 msgstr ""
 
-#: main.c:67
+#: main.c:71
 msgid ""
 "\n"
 "SHA1 implementation Copyright (C) 1995-7 Eric A. Young <eay@cryptsoft.com>\n"
@@ -1838,7 +1838,7 @@ msgid ""
 "    along with this program; if not, write to the program's developers.\n"
 msgstr ""
 
-#: main.c:93
+#: main.c:97
 msgid ""
 "usage: mutt [ -nRzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> "
 "]\n"
@@ -1869,33 +1869,33 @@ msgid ""
 "  -h\t\tthis help message"
 msgstr ""
 
-#: main.c:299
+#: main.c:303
 msgid "Error initializing terminal."
 msgstr ""
 
-#: main.c:395
+#: main.c:399
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr ""
 
-#: main.c:397
+#: main.c:401
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr ""
 
-#: main.c:535
+#: main.c:539
 msgid "No recipients specified.\n"
 msgstr ""
 
-#: main.c:608
+#: main.c:612
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr ""
 
-#: main.c:628
+#: main.c:632
 msgid "No mailbox with new mail."
 msgstr ""
 
-#: main.c:662
+#: main.c:666
 msgid "Mailbox is empty."
 msgstr ""