+ * New adnsheloex client courtesy of Tony Finch (and copyright notices

[adns.git] / settings.make.in

diff --git a/settings.make.in b/settings.make.in
index 537ebe8d31c113623b365d3f8c0642247e3f4460..3714d78a70992995abe0fbbf6410561cc09bf521 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -2,11 +2,11 @@
 #  used by autoconf/configure to generate settings.make
 #  
 #  This file is
-#    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
 #
 #  It is part of adns, which is
-#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
-#    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+#    Copyright (C) 1997-2005 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999-2004 Tony Finch <dot@dotat.at>
 #  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -22,16 +22,18 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-MAJOR=         0
-MINOR=         1
+MAJOR=         1
+MINOR=         0
 SHLIBFILE=     @SHLIBFILE@
 SHLIBSONAME=   @SHLIBSONAME@
 SHLIBFORLINK=  @SHLIBFORLINK@
 
 CC=            @CC@
 CFLAGS=                $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
+LDFLAGS=       $(AUTOLDFLAGS) $(DIRLDFLAGS) $(XLDFLAGS)
 LDLIBS=                @LIBS@ $(XLIBS)
 AUTOCFLAGS=    @CFLAGS@
+AUTOLDFLAGS=   @LDFLAGS@
 WARNS=         @WARNS@
 #WERROR=       -Werror
 
@@ -50,19 +52,25 @@ bin_dir=    $(exec_prefix)/bin
 lib_dir=       $(exec_prefix)/lib
 include_dir=   $(prefix)/include
 
-INSTALL=               install -c
+AC_INSTALL=    @INSTALL@
+ifeq ($(AC_INSTALL),./install-sh -c)
+INSTALL=       $(srcdir)/../$(AC_INSTALL)
+else
+INSTALL=       $(AC_INSTALL)
+endif
+
 INSTALL_PROGRAM=       $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=          $(INSTALL) -m 644
 
 all:                   $(TARGETS)
 
 clean mostlyclean:
-               rm -f *.o *.tmp*
+               rm -f *.o *.tmp* *.so *.so.*
 
 distclean:             clean
                rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
 
-distprep:              $(AUTOCSRCS)
+distprep:              $(AUTOCSRCS) $(AUTOCHDRS)
 
 maintainer-clean:      distclean
-               -rm -f $(AUTOCSRCS)
+               -rm -f $(AUTOCSRCS) $(AUTOCHDRS)