From 5e37b1bcb40a11bac79ac8232095c4c392366d51 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Wed, 14 Oct 1998 09:29:27 +0000 Subject: [PATCH] Various build fixes. --HG-- branch : HEAD --- Makefile.am | 4 ++++ Makefile.in | 11 ++++++----- config.h.in | 3 +++ configure | 2 +- configure.in | 2 +- dotlock.c | 4 ++++ main.c | 4 ++++ po/mutt.pot | 26 +++++++++++++------------- 8 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index f4b997491..d9653c092 100644 --- 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 87cb1b850..7317fa9c8 100644 --- 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 89ea96fb1..ea7c037c3 100644 --- a/config.h.in +++ b/config.h.in @@ -275,6 +275,9 @@ /* Define if you have the header file. */ #undef HAVE_ARGZ_H +/* Define if you have the header file. */ +#undef HAVE_GETOPT_H + /* Define if you have the header file. */ #undef HAVE_LIMITS_H diff --git a/configure b/configure index 778f93e66..d5758b07f 100755 --- 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 be24389e7..050427812 100644 --- 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 0410f0842..1d1c485f6 100644 --- a/dotlock.c +++ b/dotlock.c @@ -29,6 +29,10 @@ static char rcsid[]="$Id$"; #include #include +#ifdef HAVE_GETOPT_H +#include +#endif + #include #include #include diff --git a/main.c b/main.c index f6278a1a6..249dbc6d8 100644 --- a/main.c +++ b/main.c @@ -33,6 +33,10 @@ static char rcsid[]="$Id$"; #include #include +#ifdef HAVE_GETOPT_H +#include +#endif + const char ReachingUs[] = N_("\ To contact the developers, please mail to .\n"); diff --git a/po/mutt.pot b/po/mutt.pot index 2fbd9bd41..511ce7df2 100644 --- 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 \n" "Language-Team: LANGUAGE \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 .\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 \n" "Copyright (C) 1997-8 Thomas Roessler \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 \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 ] [ -F ] [ -m ] [ -f " "]\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 ""