From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 11 Nov 2011 10:31:35 +0000 (+0000)
Subject: compat with SunOS.
X-Git-Tag: release-1.4.14rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8696005a7d0d8e07fc699328c689397acba54d4;p=thirdparty%2Funbound.git

compat with SunOS.


git-svn-id: file:///svn/unbound/trunk@2547 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/Makefile.in b/Makefile.in
index 07da1938d..dd378fd03 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -237,10 +237,12 @@ all:	$(COMMON_OBJ) unbound$(EXEEXT) unbound-checkconf$(EXEEXT) lib unbound-host$
 	$(COMPILE) -o $@ -c $<
 
 $(ALL_OBJ):
-	$(COMPILE) -o $@ -c $<
+	@@SOURCEDETERMINE@
+	$(COMPILE) -o $@ -c @SOURCEFILE@
 
 $(RSRC_OBJ):
-	$(WINDRES) $(CPPFLAGS) $< $@
+	@@SOURCEDETERMINE@
+	$(WINDRES) $(CPPFLAGS) @SOURCEFILE@ $@
 
 rsrc_svcinst.o:	$(srcdir)/winrc/rsrc_svcinst.rc config.h
 rsrc_svcuninst.o:	$(srcdir)/winrc/rsrc_svcuninst.rc config.h
diff --git a/configure b/configure
index ca417fcdc..9d4f96a5e 100755
--- a/configure
+++ b/configure
@@ -605,6 +605,8 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 ldnsdir
+SOURCEFILE
+SOURCEDETERMINE
 UBSYMS
 EXTRALINK
 COMMON_OBJ_ALL_SYMBOLS
@@ -16496,7 +16498,7 @@ fi
 
 	WIN_HOST_OBJ_LINK="rsrc_unbound_host.o"
 
-	WIN_UBANCHOR_OBJ_LINK="rsrc_unbound_anchor.o"
+	WIN_UBANCHOR_OBJ_LINK="rsrc_unbound_anchor.o log.lo locks.lo"
 
 	WIN_CONTROL_OBJ_LINK="rsrc_unbound_control.o"
 
@@ -16921,6 +16923,22 @@ if test x_$enable_lock_checks = x_yes; then
 	echo checklock_thrjoin >> clubsyms.def
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if make supports $<" >&5
+$as_echo_n "checking if make supports $<... " >&6; }
+if test "`uname`" = "SunOS"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	SOURCEDETERMINE='echo "$?" | awk "-F " "{print $$$$1;}" > .source'
+	SOURCEFILE='`cat .source`'
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	SOURCEDETERMINE=':'
+	SOURCEFILE='$<'
+fi
+
+
+
 # check this after all other compilation checks, since the linking of the lib
 # may break checks after this.
 
diff --git a/configure.ac b/configure.ac
index 7a6d17e5e..6932c8d00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -878,6 +878,19 @@ if test x_$enable_lock_checks = x_yes; then
 	echo checklock_thrjoin >> clubsyms.def
 fi
 
+AC_MSG_CHECKING([if make supports $<])
+if test "`uname`" = "SunOS"; then
+	AC_MSG_RESULT(no)
+	SOURCEDETERMINE='echo "$?" | awk "-F " "{print $$$$1;}" > .source'
+	SOURCEFILE='`cat .source`'
+else
+	AC_MSG_RESULT(yes)
+	SOURCEDETERMINE=':'
+	SOURCEFILE='$<'
+fi
+AC_SUBST(SOURCEDETERMINE)
+AC_SUBST(SOURCEFILE)
+
 # check this after all other compilation checks, since the linking of the lib
 # may break checks after this.
 AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATH],