From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Tue, 12 Dec 2006 15:46:12 +0000 (+0000)
Subject: Small changes to help SunOS4.
X-Git-Tag: release-1.2.0~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a92596c6a9f0c82b4bf20a0fbf02e2eb84dcd719;p=thirdparty%2Fldns.git

Small changes to help SunOS4.
- ln without -f, it checks if the file exists anway.
- check AC_C_INLINE after setting flags, it changes the results.
- INLINE used for ldns_power.
---

diff --git a/Makefile.in b/Makefile.in
index f5c07ce3..3dc4afd5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,7 +88,7 @@ libldns.la:	$(LIBDNS_OBJECTS)
 
 copy-headers:
 		if [ ! -d include ] ; then mkdir include ; fi ;
-		if [ ! -d include/ldns ] ; then ln -sf ../ldns ./include/ldns ; fi ;
+		if [ ! -d include/ldns ] ; then ln -s ../ldns ./include/ldns ; fi ;
 		for i in $(LIBDNS_HEADERS); do \
 			if [ $(srcdir)/ldns/$$i -nt ./include/ldns/$$i ] ; then \
 				MVPROG=/bin/cp $(INSTALL) -m 644 $$i ./include/ldns/; \
diff --git a/configure.ac b/configure.ac
index a5ce39cc..3219434f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,11 +46,11 @@ fi
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
-AC_C_INLINE
 AC_LANG_C
 AC_TYPE_SIZE_T
 CHECK_COMPILER_FLAG(O2, [CFLAGS="$CFLAGS -O2"])
 CHECK_COMPILER_FLAG(std=c99, [CFLAGS="$CFLAGS -std=c99"], [CFLAGS="$CFLAGS -ansi"])
+AC_C_INLINE
 AC_CHECK_TYPE(int8_t, char)
 AC_CHECK_TYPE(int16_t, short)
 AC_CHECK_TYPE(int32_t, int)
diff --git a/ldns/util.h.in b/ldns/util.h.in
index fb6f41e9..d6717584 100644
--- a/ldns/util.h.in
+++ b/ldns/util.h.in
@@ -199,7 +199,7 @@ void ldns_set_bit(uint8_t *byte, int bit_nr, bool value);
  * (or 1 of b < 1)
  */
 /*@unused@*/
-static inline long
+INLINE long
 ldns_power(long a, long b) {
 	long result = 1;
 	while (b > 0) {