Alll of Craig Metz's changes for IPv6 and IPSEC except the POP3 stuff.

[~andy/fetchmail] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1000705c4a4e5ec91de92cb0e221ab48dfd91fae..1dc754a52af0cec1e4ea3d192008bbbb1dd47bb0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # If you're running QNX, we can't assume a working autoconf.
 # So just uncomment all the lines marked QNX.
 
-VERS=4.1.0
+VERS=4.3.7
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@
@@ -22,6 +22,9 @@ YACC = @YACC@
 # YACC = yacc
 YACCFLAGS = -dt
 
+CEFLAGS = @CEFLAGS@
+LDEFLAGS = @LDEFLAGS@
+
 # How to invoke ranlib.  This is only used by the `glob' subdirectory.
 RANLIB = @RANLIB@
 
@@ -32,6 +35,7 @@ DEFS = @DEFS@ @EXTRADEFS@
 defines =  -DRELEASE_ID=\"$(VERS)\" $(DEFS)
 
 # If your system needs extra libraries loaded in, define them here.
+# In particular, add -lresolv if you are running bind 4.9.5
 LOADLIBS = @LIBS@ @LEXLIB@
 # LOADLIBS = -lsocket3r -lunix3r       # QNX
 
@@ -61,7 +65,7 @@ manext = 1
 mandir = @mandir@/man$(manext)
 
 # Program to install `make'.
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 # Program to install the man page.
 INSTALL_DATA = @INSTALL_DATA@
 # Generic install program.
@@ -73,13 +77,13 @@ MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 
 # Programs to make tags files.
-ETAGS = etags -tw
-CTAGS = ctags -tw
+ETAGS = etags
+CTAGS = ctags
 
 protobjs = rcfile_y.o rcfile_l.o socket.o getpass.o pop2.o pop3.o imap.o \
        etrn.o fetchmail.o env.o options.o daemon.o driver.o rfc822.o smtp.o \
-       xmalloc.o uid.o mxget.o md5c.o md5ify.o interface.o netrc.o base64.o \
-       error.o
+       xmalloc.o uid.o mxget.o md5c.o md5ify.o rpa.o interface.o netrc.o \
+       base64.o error.o
 
 objs = $(protobjs) $(extras) $(EXTRAOBJ)
 
@@ -89,8 +93,9 @@ srcs = $(srcdir)/socket.c $(srcdir)/getpass.c $(srcdir)/pop2.c                \
        $(srcdir)/options.c $(srcdir)/daemon.c                          \
        $(srcdir)/driver.c $(srcdir)/rfc822.c $(srcdir)/smtp.c          \
        $(srcdir)/xmalloc.c $(srcdir)/uid.c $(srcdir)/mxget.c           \
-       $(srcdir)/md5c.c $(srcdir)/md5ify.c $(srcdir)/interface.c       \
-       $(srcdir)/netrc.c $(srcdir)/base64.c $(srcdir)/error.c
+       $(srcdir)/md5c.c $(srcdir)/md5ify.c $(srcdir)/rpa.c             \
+       $(srcdir)/interface.c $(srcdir)/netrc.c $(srcdir)/base64.c      \
+       $(srcdir)/error.c
 
 .SUFFIXES:
 .SUFFIXES: .o .c .h .y .l .ps .dvi .info .texi
@@ -101,14 +106,14 @@ all: fetchmail
 .PHONY: all
 
 fetchmail: $(objs)
-       $(CC) $(LDFLAGS) $(objs) $(LOADLIBS) -o fetchmail
+       $(CC) $(LDEFLAGS) $(LDFLAGS) $(objs) $(LOADLIBS) -o fetchmail
 
 # Tester for address parsing
 rfc822: rfc822.c
        gcc -DTESTMAIN -g rfc822.c -o rfc822
 
 .c.o:
-       $(CC) $(defines) -c -I$(srcdir) -I. $(CFLAGS) $<
+       $(CC) $(defines) -c -I$(srcdir) -I. $(CEFLAGS) $(CFLAGS) $<
 
 # For some losing Unix makes.
 SHELL = /bin/sh
@@ -176,6 +181,7 @@ rcfile_l.c rcfile_l.h: $(srcdir)/rcfile_l.l
        $(LEX) $(LEXFLAGS) $(srcdir)/rcfile_l.l
        mv lex.yy.c rcfile_l.c
 rcfile_y.c rcfile_y.h: $(srcdir)/rcfile_y.y
+       @echo "expect conflicts:  2 shift/reduce"
        $(YACC) $(YACCFLAGS) $(srcdir)/rcfile_y.y
        mv y.tab.c rcfile_y.c
        mv -f y.tab.h rcfile_y.h
@@ -190,7 +196,7 @@ headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h \
        $(srcdir)/mx.h $(srcdir)/md5.h $(srcdir)/md5global.h \
        $(srcdir)/netrc.h $(srcdir)/tunable.h
 extra = $(srcdir)/alloca.c $(srcdir)/getopt.[ch] $(srcdir)/getopt1.c \
-       $(srcdir)/strcasecmp.c
+       $(srcdir)/strcasecmp.c $(srcdir)/strstr.c
 docs = $(srcdir)/COPYING $(srcdir)/FEATURES $(srcdir)/fetchmail-features.html \
        $(srcdir)/design-notes.html $(srcdir)/NOTES \
        $(srcdir)/INSTALL $(srcdir)/NEWS  $(srcdir)/README \
@@ -202,7 +208,7 @@ config = $(srcdir)/Makefile.in $(srcdir)/configure.in $(srcdir)/configure \
 scripts = $(srcdir)/install.sh $(srcdir)/mkinstalldirs \
        $(srcdir)/specgen.sh $(srcdir)/lsmgen.sh
 all = $(docs) $(config) $(srcs) $(parser) $(headers) $(extra) $(scripts) \
-       $(srcdir)/contrib/* $(srcdir)/MANIFEST $(srcdir)/LIBOPIE.PATCH
+       $(srcdir)/contrib/*[A-Za-uw-z] $(srcdir)/MANIFEST
 
 MANIFEST: $(srcdir) Makefile.in
        @echo $(all) | tr "[ \t]" '\n' | sed -e '/^\.\//s///' | sort >MANIFEST
@@ -239,7 +245,7 @@ RPMROOT=/usr/src/redhat
 RPM = rpm
 RPMFLAGS = -ba
 rpm: dist
-       cp fetchmail-$(VERS).tar.gz $(RPMROOT)/SOURCES;
+       cp fetchmail-$(VERS).tar.gz fetchmail.gif $(RPMROOT)/SOURCES;
        $(srcdir)/specgen.sh $(VERS) >$(RPMROOT)/SPECS/fetchmail.spec
        cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) fetchmail.spec  
        cp $(RPMROOT)/RPMS/`arch|sed 's/i[4-9]86/i386/'`/fetchmail-$(VERS)*.rpm $(srcdir)