better test for SunOS make.

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

diff --git a/Makefile.in b/Makefile.in
index dd378fd03aaa16c1c9f3c1afdbe1daef24551945..ee5eaf2be6bacb1d006d5d86d93f867fcb47fb2f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -337,7 +337,7 @@ harvest$(EXEEXT):   $(HARVEST_OBJ_LINK) libunbound.la
        $(LINK) -o $@ $(HARVEST_OBJ_LINK) $(LIBS) -L. -L.libs -lunbound
 
 unbound-control-setup: $(srcdir)/smallapp/unbound-control-setup.sh
-       sed -e 's:^DESTDIR=.*$$:DESTDIR=$(UNBOUND_RUN_DIR):' < $< > $@
+       sed -e 's:^DESTDIR=.*$$:DESTDIR=$(UNBOUND_RUN_DIR):' < $(srcdir)/smallapp/unbound-control-setup.sh > $@
        -chmod +x $@
 
 #testcode/ldns-testpkts.c:     $(ldnsdir)/examples/ldns-testpkts.c \
@@ -360,17 +360,17 @@ pythonmod.lo pythonmod.o: $(srcdir)/pythonmod/pythonmod.c config.h \
 
 pythonmod/interface.h: $(srcdir)/pythonmod/interface.i $(srcdir)/config.h
        @-if test ! -d pythonmod; then $(INSTALL) -d pythonmod; fi
-       $(SWIG) $(CPPFLAGS) -o $@ -python $<
+       $(SWIG) $(CPPFLAGS) -o $@ -python $(srcdir)/pythonmod/interface.i
 
 libunbound_wrap.lo libunbound_wrap.o: libunbound/python/libunbound_wrap.c \
        $(srcdir)/libunbound/unbound.h
 libunbound/python/libunbound_wrap.c:   $(srcdir)/libunbound/python/libunbound.i $(srcdir)/libunbound/unbound.h
        @-if test ! -d libunbound/python; then $(INSTALL) -d libunbound/python; fi
-       $(SWIG) -python -o $@ $(CPPFLAGS) $<
+       $(SWIG) -python -o $@ $(CPPFLAGS) $(srcdir)/libunbound/python/libunbound.i
 
 # Pyunbound python unbound wrapper
 _unbound.la:   libunbound_wrap.lo libunbound.la
-       $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined -o $@ $< -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound $(LIBS)
+       $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound $(LIBS)
 
 util/config_file.c:    util/configparser.h
 util/configlexer.c:  $(srcdir)/util/configlexer.lex util/configparser.h

diff --git a/configure b/configure
index 53505c0ac85bdcd49567c656f960b194c10a26db..8ed82e360b1c8090df0ac22e049c2033f2e6a659 100755 (executable)
--- a/configure
+++ b/configure
@@ -16923,9 +16923,30 @@ 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}: checking if ${MAKE:-make} supports $< with implicit rule in scope" >&5
+$as_echo_n "checking if ${MAKE:-make} supports $< with implicit rule in scope... " >&6; }
+# on openBSD, the implicit rule make $< work.
+# on Solaris, it does not work (but $? does).
+# gmake works.
+cat >conftest.make <<EOF
+all:   conftest.lo
+
+conftest.lo foo.lo bla.lo:
+       if test -f "\$<"; then touch \$@; fi
+
+.SUFFIXES: .lo
+.c.lo:
+       if test -f "\$<"; then touch \$@; fi
+
+conftest.lo:        conftest.dir/conftest.c
+EOF
+mkdir conftest.dir
+touch conftest.dir/conftest.c
+rm -f conftest.lo conftest.c
+${MAKE:-make} -f conftest.make
+rm -f conftest.make conftest.c conftest.dir/conftest.c
+rm -rf conftest.dir
+if test ! -f conftest.lo; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
        SOURCEDETERMINE='echo "$?" | awk "-F " "{print \$$1;}" > .source'
@@ -16936,6 +16957,7 @@ $as_echo "yes" >&6; }
        SOURCEDETERMINE=':'
        SOURCEFILE='$<'
 fi
+rm -f conftest.lo
 
 
 

diff --git a/configure.ac b/configure.ac
index fd19375cf5e79e63d9cf738cf438899424c4738d..f2486bf94c0bf4c99fca18a4bd110005295e7226 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -878,8 +878,29 @@ 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_CHECKING([if ${MAKE:-make} supports $< with implicit rule in scope])
+# on openBSD, the implicit rule make $< work.
+# on Solaris, it does not work (but $? does).
+# gmake works.
+cat >conftest.make <<EOF
+all:   conftest.lo
+
+conftest.lo foo.lo bla.lo:
+       if test -f "\$<"; then touch \$@; fi
+
+.SUFFIXES: .lo
+.c.lo:
+       if test -f "\$<"; then touch \$@; fi
+
+conftest.lo:        conftest.dir/conftest.c
+EOF
+mkdir conftest.dir
+touch conftest.dir/conftest.c
+rm -f conftest.lo conftest.c
+${MAKE:-make} -f conftest.make
+rm -f conftest.make conftest.c conftest.dir/conftest.c
+rm -rf conftest.dir
+if test ! -f conftest.lo; then
        AC_MSG_RESULT(no)
        SOURCEDETERMINE='echo "$?" | awk "-F " "{print \$$1;}" > .source'
        SOURCEFILE='`cat .source`'
@@ -888,6 +909,7 @@ else
        SOURCEDETERMINE=':'
        SOURCEFILE='$<'
 fi
+rm -f conftest.lo
 AC_SUBST(SOURCEDETERMINE)
 AC_SUBST(SOURCEFILE)