diff --git a/Makefile.in b/Makefile.in index 349cec0d..f7c908ac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,6 +76,7 @@ $(distdir): mkdir -p $(distdir)/src/example mkdir -p $(distdir)/src/extension mkdir -p $(distdir)/doc + mkdir -p $(distdir)/spec cp $(srcdir)/configure.ac $(distdir) cp $(srcdir)/configure $(distdir) cp $(srcdir)/Makefile.in $(distdir) @@ -87,7 +88,7 @@ $(distdir): cp $(srcdir)/src/*.[ch] $(distdir)/src cp $(srcdir)/src/extension/*.[ch] $(distdir)/src/extension cp $(srcdir)/src/getdns/*.in $(distdir)/src/getdns - cp $(srcdir)/src/getdns/*.h $(distdir)/src/getdns + cp $(srcdir)/src/getdns/getdns_*.h $(distdir)/src/getdns cp $(srcdir)/src/test/Makefile.in $(distdir)/src/test cp $(srcdir)/src/test/*.[ch] $(distdir)/src/test cp $(srcdir)/src/test/*.sh $(distdir)/src/test @@ -96,6 +97,8 @@ $(distdir): cp $(srcdir)/src/example/*.[ch] $(distdir)/src/example cp $(srcdir)/doc/Makefile.in $(distdir)/doc cp $(srcdir)/doc/*.in $(distdir)/doc + cp $(srcdir)/doc/manpgaltnames $(distdir)/doc + cp $(srcdir)/spec/* $(distdir)/spec distcheck: $(distdir).tar.gz gzip -cd $(distdir).tar.gz | tar xvf - diff --git a/configure b/configure index adf29085..689f2d99 100755 --- a/configure +++ b/configure @@ -575,7 +575,7 @@ PACKAGE_STRING='getdns 0.1.0' PACKAGE_BUGREPORT='stub-resolver@verisignlabs.com' PACKAGE_URL='http://www.getdnsapi.net' -ac_unique_file="src/getdns/getdns.h" +ac_unique_file="src/getdns/getdns.h.in" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -665,6 +665,7 @@ CPPFLAGS LDFLAGS CFLAGS CC +GETDNS_COMPILATION_COMMENT target_alias host_alias build_alias @@ -2176,6 +2177,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +CURRENT_DATE=`LC_ALL=C date` +GETDNS_COMPILATION_COMMENT="getdns 0.1.0 configured on $CURRENT_DATE for the February 2014 version of the API" + # AM_INIT_AUTOMAKE # LT_INIT @@ -11398,7 +11402,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: Default trust anchor: $TRUST_ANCHOR_FILE" >&5 $as_echo "$as_me: Default trust anchor: $TRUST_ANCHOR_FILE" >&6;} -ac_config_files="$ac_config_files Makefile src/Makefile src/getdns/Makefile src/example/Makefile src/test/Makefile doc/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/getdns/Makefile src/getdns/getdns.h src/example/Makefile src/test/Makefile doc/Makefile" if test -n "$DOXYGEN" then ac_config_files="$ac_config_files src/Doxyfile" @@ -12400,6 +12404,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/getdns/Makefile") CONFIG_FILES="$CONFIG_FILES src/getdns/Makefile" ;; + "src/getdns/getdns.h") CONFIG_FILES="$CONFIG_FILES src/getdns/getdns.h" ;; "src/example/Makefile") CONFIG_FILES="$CONFIG_FILES src/example/Makefile" ;; "src/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; diff --git a/configure.ac b/configure.ac index e1edf082..4b30e5c7 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,10 @@ AC_PREREQ([2.56]) AC_INIT([getdns], [0.1.0], [stub-resolver@verisignlabs.com], [], [http://www.getdnsapi.net]) -AC_CONFIG_SRCDIR([src/getdns/getdns.h]) +CURRENT_DATE=`LC_ALL=C date` +GETDNS_COMPILATION_COMMENT="AC_PACKAGE_STRING configured on $CURRENT_DATE for the February 2014 version of the API" +AC_SUBST(GETDNS_COMPILATION_COMMENT) +AC_CONFIG_SRCDIR([src/getdns/getdns.h.in]) # AM_INIT_AUTOMAKE # LT_INIT AC_CONFIG_MACRO_DIR([m4]) @@ -229,7 +232,7 @@ AC_DEFINE_UNQUOTED([TRUST_ANCHOR_FILE], ["$TRUST_ANCHOR_FILE"], [Default trust a AC_SUBST(TRUST_ANCHOR_FILE) AC_MSG_NOTICE([Default trust anchor: $TRUST_ANCHOR_FILE]) -AC_CONFIG_FILES([Makefile src/Makefile src/getdns/Makefile src/example/Makefile src/test/Makefile doc/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile src/getdns/Makefile src/getdns/getdns.h src/example/Makefile src/test/Makefile doc/Makefile]) if [ test -n "$DOXYGEN" ] then AC_CONFIG_FILES([src/Doxyfile]) fi diff --git a/doc/manpgaltnames b/doc/manpgaltnames index 82800b7c..78de6e85 100755 --- a/doc/manpgaltnames +++ b/doc/manpgaltnames @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # generate list of alternate names for the specified man page # used to generate alternative man pages main=${1%.[0-9]} diff --git a/src/getdns/getdns.h b/src/getdns/getdns.h.in similarity index 99% rename from src/getdns/getdns.h rename to src/getdns/getdns.h.in index dccf7223..4c37f750 100644 --- a/src/getdns/getdns.h +++ b/src/getdns/getdns.h.in @@ -44,7 +44,7 @@ extern "C" { #endif -#define GETDNS_COMPILATION_COMMENT The API implementation should fill in something here, such as a compilation version string and date, and change it each time the API is compiled. +#define GETDNS_COMPILATION_COMMENT "@GETDNS_COMPILATION_COMMENT@" /* Return values */ typedef enum getdns_return_t {