X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=configure.in;h=2221d08a06796bfb401ba77e19c44af895f85275;hp=dc09113cfd775fa6d22bbe1bad0ac98b75e0a963;hb=3212d4ff1f32821483c1c8f2fd592666a83050f1;hpb=a0c76eee25d429ad5208f6d1947d0d42dfbfeca0

diff --git a/configure.in b/configure.in
index dc09113..2221d08 100644
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,15 @@
 # configure.in - input to autoconf
 #  
-#  This file is
-#    Copyright (C) 1997-1999 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>
+#  This file is part of adns, which is
+#    Copyright (C) 1997-2000,2003,2006,2014  Ian Jackson
+#    Copyright (C) 2014  Mark Wooding
+#    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)
+#  the Free Software Foundation; either version 3, or (at your option)
 #  any later version.
 #  
 #  This program is distributed in the hope that it will be useful,
@@ -18,12 +18,26 @@
 #  GNU General Public License for more details.
 #  
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+#  along with this program; if not, write to the Free Software Foundation.
 
 AC_INIT(src/adns.h)
 AC_CONFIG_HEADER(src/config.h)
 
+dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
+define([DPKG_CACHED_TRY_COMPILE],[
+ AC_MSG_CHECKING($1)
+ AC_CACHE_VAL($2,[
+  AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no])
+ ])
+ if test "x$$2" = xyes; then
+  true
+  $5
+ else
+  true
+  $6
+ fi
+])
+
 AC_MSG_CHECKING(whether you requested dynamic linking)
 AC_SUBST(ENABLE_DYNAMIC)
 AC_ARG_ENABLE(dynamic,
@@ -42,7 +56,7 @@ AC_ARG_ENABLE(dynamic,
 		;;
 	esac
 ],[
-		ENABLE_DYNAMIC=yes
+		ENABLE_DYNAMIC=elf
 		AC_MSG_RESULT([yes, by default])
 ])
 
@@ -91,16 +105,30 @@ ADNS_C_GETFUNC(inet_aton,resolv,[
  AC_MSG_WARN([inet_aton is in libresolv, urgh.  Must use -lresolv.])
 ])
 
-ADNS_C_GCCATTRIB
+DPKG_CACHED_TRY_COMPILE(inlines,dpkg_cv_c_inline,,
+ [} inline int foo (int x) {],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_INLINE),
+ AC_MSG_RESULT(no))
 
 AC_SUBST(WARNS)
 
 if test "${GCC-no}" = yes; then
 	WARNS="-Wall -Wmissing-prototypes -Wwrite-strings -Wstrict-prototypes -Wcast-qual -Wpointer-arith"
+	saved_cflags="$CFLAGS"
+	CFLAGS="$CFLAGS -Wno-pointer-sign"
+	DPKG_CACHED_TRY_COMPILE(-Wno-pointer-sign,adns_cv_c_wnoptrsign,,
+	 [],
+	 AC_MSG_RESULT(yes)
+	 WARNS="$WARNS -Wno-pointer-sign",
+	 AC_MSG_RESULT(no))
+	CFLAGS="$saved_cflags"
 else
 	WARNS=
 fi
 
+ADNS_C_GCCATTRIB
+
 AC_SUBST(SHLIBCC)
 AC_SUBST(MKSHLIB_1)
 AC_SUBST(MKSHLIB_2)
@@ -120,6 +148,6 @@ MKSHLIB_2=''
 MKSHLIB_3='-lc'
 
 AC_OUTPUT(
-	settings.make Makefile
+	common.make settings.make Makefile
 	src/Makefile client/Makefile dynamic/Makefile regress/Makefile
 )