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 07da1938d96f0ad095ee045ac0f3cdc83d3bdec4..dd378fd03aaa16c1c9f3c1afdbe1daef24551945 100644 (file)
--- 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 ca417fcdc485e2a61cb86ad9bd84fa3fefca7dc5..9d4f96a5e575608b27cf9305d94f9b6d0920e6ad 100755 (executable)
--- 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 7a6d17e5e5d88c44e3fbce33028e5be058dc14bc..6932c8d0086390a67a0271fd6f19d000757e8d1e 100644 (file)
--- 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],