Reentrancy: Introduce adns__cancel

[adns.git] / settings.make.in

diff --git a/settings.make.in b/settings.make.in
index 6b705656c0a4966ef0cd130c9036d9ecd0794ff7..a8830daddb46b2f9a2f744a234207b5406f4448c 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,8 +1,12 @@
-# settings.make.in - main configuration settings for Makefiles,
+# settings.make[.in] - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
-#  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
-#
+#  This file is part of adns, which is
+#    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+#    Copyright (C) 1999-2000,2003,2006  Tony Finch
+#    Copyright (C) 1991 Massachusetts Institute of Technology
+#  (See the file INSTALL for full details.)
+#  
 #  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
 #  the Free Software Foundation; either version 2, or (at your option)
@@ -17,15 +21,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=         3
 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
 
@@ -40,23 +47,29 @@ MKSHLIB_3=  @MKSHLIB_3@
 
 prefix=                @prefix@
 exec_prefix=   @exec_prefix@
-bin_dir=       $(exec_prefix)/bin
-lib_dir=       $(exec_prefix)/lib
-include_dir=   $(prefix)/include
+bindir=                @bindir@
+libdir=                @libdir@
+includedir=    @includedir@
+
+AC_INSTALL=    @INSTALL@
+ifeq ($(AC_INSTALL),./install-sh -c)
+INSTALL=       $(srcdir)/../$(AC_INSTALL)
+else
+INSTALL=       $(AC_INSTALL)
+endif
 
-INSTALL=               install -o 0 -g 0
 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)