ISC_PLATFORM progress

bk: 3e2e63baT0sQVI05ULXU79vIQNB_pw

diff --git a/configure.in b/configure.in
index f9bf8a29601cdfbed7ba77013f3177b60c83d213..472e595d3117bc2fcaa2c7207cb7aeae92137f80 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3440,6 +3440,42 @@ case "$ac_cv_var_irig_sucks" in
  yes) AC_DEFINE(IRIG_SUCKS, 1, [Should we use the IRIG sawtooth filter?]) ;;
 esac
 
+false && ISC_PLATFORM_HAVEIF_LADDRCONF="#define ISC_PLATFORM_HAVEIF_LADDRCONF 1"
+false && ISC_PLATFORM_HAVEIF_LADDRREQ="#define ISC_PLATFORM_HAVEIF_LADDRREQ 1"
+false && ISC_PLATFORM_HAVEIN6PKTINFO="#define ISC_PLATFORM_HAVEIN6PKTINFO 1"
+false && ISC_PLATFORM_HAVEIPV6="#define ISC_PLATFORM_HAVEIPV6 1"
+if test $ac_cv_struct_sockaddr_has_sa_len = yes; then
+    ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1"
+fi
+false && ISC_PLATFORM_NEEDIN6ADDRANY="#define ISC_PLATFORM_NEEDIN6ADDRANY 1"
+
+AC_SUBST(ISC_PLATFORM_BRACEPTHREADONCEINIT)
+AC_SUBST(ISC_PLATFORM_FIXIN6ISADDR)
+AC_SUBST(ISC_PLATFORM_HAVEIF_LADDRCONF)
+AC_SUBST(ISC_PLATFORM_HAVEIF_LADDRREQ)
+AC_SUBST(ISC_PLATFORM_HAVEIN6PKTINFO)
+AC_SUBST(ISC_PLATFORM_HAVEINADDR6)
+AC_SUBST(ISC_PLATFORM_HAVEIPV6)
+AC_SUBST(ISC_PLATFORM_HAVELIFCONF)
+AC_SUBST(ISC_PLATFORM_HAVELONGLONG)
+AC_SUBST(ISC_PLATFORM_HAVESALEN)
+AC_SUBST(ISC_PLATFORM_MSGHDRFLAVOR)
+AC_SUBST(ISC_PLATFORM_NEEDATON)
+AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRANY)
+AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
+AC_SUBST(ISC_PLATFORM_NEEDNETINET6IN6H)
+AC_SUBST(ISC_PLATFORM_NEEDNETINETIN6H)
+AC_SUBST(ISC_PLATFORM_NEEDNTOP)
+AC_SUBST(ISC_PLATFORM_NEEDPORTT)
+AC_SUBST(ISC_PLATFORM_NEEDPTON)
+AC_SUBST(ISC_PLATFORM_NEEDSTRSEP)
+AC_SUBST(ISC_PLATFORM_NEEDSYSSELECTH)
+AC_SUBST(ISC_PLATFORM_NEEDVSNPRINTF)
+AC_SUBST(ISC_PLATFORM_QUADFORMAT)
+AC_SUBST(ISC_PLATFORM_RLIMITTYPE)
+AC_SUBST(ISC_PLATFORM_USEDECLSPEC)
+AC_SUBST(ISC_PLATFORM_USETHREADS)
+
 case "$build" in
  $host)
     ;;
@@ -3478,6 +3514,7 @@ AC_CONFIG_FILES(ElectricFence/Makefile)
 AC_CONFIG_FILES(adjtimed/Makefile)
 AC_CONFIG_FILES(clockstuff/Makefile)
 AC_CONFIG_FILES(include/Makefile)
+AC_CONFIG_FILES(include/isc/Makefile)
 AC_CONFIG_FILES(include/isc/platform.h)
 AC_CONFIG_FILES(kernel/Makefile)
 AC_CONFIG_FILES(kernel/sys/Makefile)

diff --git a/include/Makefile.am b/include/Makefile.am
index b38f1cd82556637ab9984255be2600594cd55351..9bb7da22b1268ba4528ba822676ebb93208e8fe6 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = ../util/ansi2knr
 ETAGS_ARGS = $(srcdir)/Makefile.am
 #EXTRA_DIST = TAGS
 
+SUBDIRS = isc
+
 noinst_HEADERS = \
        adjtime.h \
        audio.h \
@@ -52,4 +54,3 @@ noinst_HEADERS = \
        recvbuff.h \
        trimble.h
 
-

diff --git a/include/isc/Makefile.am b/include/isc/Makefile.am
new file mode 100644 (file)
index 0000000..38b66d8
--- /dev/null
+++ b/include/isc/Makefile.am
@@ -0,0 +1,35 @@
+#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+AUTOMAKE_OPTIONS = ../util/ansi2knr
+ETAGS_ARGS = $(srcdir)/Makefile.am
+#EXTRA_DIST = TAGS
+
+noinst_HEADERS = \
+       app.h \
+       assertions.h \
+       boolean.h \
+       error.h \
+       formatcheck.h \
+       int.h \
+       interfaceiter.h \
+       ipv6.h \
+       lang.h \
+       lib.h \
+       list.h \
+       magic.h \
+       mem.h \
+       msgcat.h \
+       msgs.h \
+       mutex.h \
+       net.h \
+       netaddr.h \
+       offset.h \
+       once.h \
+       platform.h \
+       print.h \
+       result.h \
+       sockaddr.h \
+       strerror.h \
+       string.h \
+       types.h \
+       util.h \
+       $(NULL)

diff --git a/libntp/Makefile.am b/libntp/Makefile.am
index 7bb90188a5478a00924e728ef296b3e05498dfd8..cf0dda7907043bb8f0309101b2682fb67c6256a2 100644 (file)
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@ -21,7 +21,7 @@ libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
 libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
 EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I../include
 ETAGS_ARGS = Makefile.am
 
 noinst_HEADERS = lib_strbuf.h log.h