makefile compat, ports updated and remove unused substitutions.

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

Makefile.in

@@ -22,11 +22,9 @@ EXEEXT=@EXEEXT@
 configfile=@ub_conf_file@
 UNBOUND_RUN_DIR=@UNBOUND_RUN_DIR@
 CHECKLOCK_SRC=@CHECKLOCK_SRC@
-UB_ON_WINDOWS=@UB_ON_WINDOWS@
 WITH_PYTHONMODULE=@WITH_PYTHONMODULE@
 WITH_PYUNBOUND=@WITH_PYUNBOUND@
 PYTHON_SITE_PKG=@PYTHON_SITE_PKG@
-EXPORT_ALL_SYMBOLS=@EXPORT_ALL_SYMBOLS@
 PYTHONMOD_INSTALL=@PYTHONMOD_INSTALL@
 PYTHONMOD_UNINSTALL=@PYTHONMOD_UNINSTALL@
 PYUNBOUND_INSTALL=@PYUNBOUND_INSTALL@

configure

@@ -610,7 +610,6 @@ SOURCEDETERMINE
 UBSYMS
 EXTRALINK
 COMMON_OBJ_ALL_SYMBOLS
-EXPORT_ALL_SYMBOLS
 LIBOBJ_WITHOUT_CTIME
 WIN_CHECKCONF_OBJ_LINK
 WIN_CONTROL_OBJ_LINK
@@ -621,7 +620,6 @@ WIN_DAEMON_OBJ
 WIN_DAEMON_SRC
 WINAPPS
 WINDRES
-UB_ON_WINDOWS
 CHECKLOCK_SRC
 staticexe
 HAVE_SSL
@@ -16378,8 +16376,6 @@ if test "$USE_WINSOCK" = 1; then
 
 $as_echo "#define UB_ON_WINDOWS 1" >>confdefs.h
 
-	UB_ON_WINDOWS=yes
-
 	for ac_header in iphlpapi.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "iphlpapi.h" "ac_cv_header_iphlpapi_h" "$ac_includes_default
@@ -16889,7 +16885,6 @@ fi
 
 case "$enable_allsymbols" in
 	yes)
-	EXPORT_ALL_SYMBOLS=yes
 	COMMON_OBJ_ALL_SYMBOLS=""
 	UBSYMS=""
 	EXTRALINK="-L. -L.libs -lunbound"
@@ -16898,7 +16893,6 @@ $as_echo "#define EXPORT_ALL_SYMBOLS 1" >>confdefs.h
 
 	;;
 	no|*)
-	EXPORT_ALL_SYMBOLS=no
 	COMMON_OBJ_ALL_SYMBOLS='$(COMMON_OBJ)'
 	UBSYMS='-export-symbols $(srcdir)/libunbound/ubsyms.def'
 	EXTRALINK=""
@@ -16907,7 +16901,6 @@ esac
 
 
 
-
 if test x_$enable_lock_checks = x_yes; then
 	UBSYMS="-export-symbols clubsyms.def"
 	cp ${srcdir}/libunbound/ubsyms.def clubsyms.def
@@ -16926,7 +16919,7 @@ fi
 { $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).
+# on Solaris, it does not work ($? is changed sources, $^ lists dependencies).
 # gmake works.
 cat >conftest.make <<EOF
 all:	conftest.lo
@@ -16949,7 +16942,7 @@ 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'
+	SOURCEDETERMINE='echo "$^" | awk "-F " "{print \$$1;}" > .source'
 	SOURCEFILE='`cat .source`'
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

configure.ac

@@ -785,8 +785,6 @@ fi
 ACX_CHECK_GETADDRINFO_WITH_INCLUDES
 if test "$USE_WINSOCK" = 1; then
 	AC_DEFINE(UB_ON_WINDOWS, 1, [Use win32 resources and API])
-	UB_ON_WINDOWS=yes
-	AC_SUBST(UB_ON_WINDOWS)
 	AC_CHECK_HEADERS([iphlpapi.h],,, [AC_INCLUDES_DEFAULT
 #include <windows.h>
 	])
@@ -846,20 +844,17 @@ AC_REPLACE_FUNCS(ctime_r)
 AC_ARG_ENABLE(allsymbols, AC_HELP_STRING([--enable-allsymbols], [export all symbols from libunbound and link binaries to it, smaller install size but libunbound export table is polluted by internal symbols]))
 case "$enable_allsymbols" in
 	yes)
-	EXPORT_ALL_SYMBOLS=yes
 	COMMON_OBJ_ALL_SYMBOLS=""
 	UBSYMS=""
 	EXTRALINK="-L. -L.libs -lunbound"
 	AC_DEFINE(EXPORT_ALL_SYMBOLS, 1, [Define this if you enabled-allsymbols from libunbound to link binaries to it for smaller install size, but the libunbound export table is polluted by internal symbols])
 	;;
 	no|*)
-	EXPORT_ALL_SYMBOLS=no
 	COMMON_OBJ_ALL_SYMBOLS='$(COMMON_OBJ)'
 	UBSYMS='-export-symbols $(srcdir)/libunbound/ubsyms.def'
 	EXTRALINK=""
 	;;
 esac
-AC_SUBST(EXPORT_ALL_SYMBOLS)
 AC_SUBST(COMMON_OBJ_ALL_SYMBOLS)
 AC_SUBST(EXTRALINK)
 AC_SUBST(UBSYMS)
@@ -880,7 +875,7 @@ fi
 
 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).
+# on Solaris, it does not work ($? is changed sources, $^ lists dependencies).
 # gmake works.
 cat >conftest.make <<EOF
 all:	conftest.lo
@@ -902,7 +897,7 @@ 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'
+	SOURCEDETERMINE='echo "$^" | awk "-F " "{print \$$1;}" > .source'
 	SOURCEFILE='`cat .source`'
 else
 	AC_MSG_RESULT(yes)

doc/Changelog

@@ -1,3 +1,7 @@
+11 November 2011: Wouter
+	- Makefile compat with SunOS make, BSD make and GNU make.
+	- iana ports updated.
+
 10 November 2011: Wouter
 	- Makefile changed for BSD make compatibility.
 

util/iana_ports.inc

@@ -5096,6 +5096,7 @@
 17185,
 17219,
 17221,
+17222,
 17234,
 17235,
 17500,