BIND 10 #2356: examples autoconf m4

[BIND 10 Development]

#2356: examples autoconf m4
-------------------------------------+-------------------------------------
            Reporter:  jreed         |                        Owner:
                Type:  defect        |  UnAssigned
            Priority:  medium        |                       Status:  new
           Component:  build system  |                    Milestone:  New
           Sensitive:  0             |  Tasks
         Sub-Project:  DNS           |                     Keywords:
Estimated Difficulty:  0             |              Defect Severity:  N/A
         Total Hours:  0             |  Feature Depending on Ticket:
                                     |          Add Hours to Ticket:  0
                                     |                    Internal?:  0
-------------------------------------+-------------------------------------
 The ./configure failed for me in examples because it couldn't find the
 boost header when checking the libdns++ header and then couldn't find the
 dns library. Here is my patch for:

 Use SAVED instead of SAVES. There was at least one case that
 it didn't get defined correctly.

 Use BOOST_CPPFLAGS.

 Fix minor grammar issue in error output.

 Get rid of unused assignment.


 {{{
 diff --git a/examples/m4/ax_boost_include.m4
 b/examples/m4/ax_boost_include.m4
 index e41614d..77d19ca 100644
 --- a/examples/m4/ax_boost_include.m4
 +++ b/examples/m4/ax_boost_include.m4
 @@ -34,7 +34,7 @@ if test -z "$with_boost_include"; then
                 fi
         done
  fi
 -CPPFLAGS_SAVES="$CPPFLAGS"
 +CPPFLAGS_SAVED="$CPPFLAGS"
  if test "${boost_include_path}" ; then
         BOOST_CPPFLAGS="-I${boost_include_path}"
         CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
 @@ -57,7 +57,7 @@ AC_TRY_COMPILE([
   CPPFLAGS_BOOST_THREADCONF="-DBOOST_DISABLE_THREADS=1"],
  [AC_MSG_RESULT(yes)])

 -CPPFLAGS="$CPPFLAGS_SAVES $CPPFLAGS_BOOST_THREADCONF"
 +CPPFLAGS="$CPPFLAGS_SAVED $CPPFLAGS_BOOST_THREADCONF"
  AC_SUBST(BOOST_CPPFLAGS)

  AC_LANG_RESTORE
 diff --git a/examples/m4/ax_isc_bind10.m4 b/examples/m4/ax_isc_bind10.m4
 index 63e028c..12847c6 100644
 --- a/examples/m4/ax_isc_bind10.m4
 +++ b/examples/m4/ax_isc_bind10.m4
 @@ -42,19 +42,19 @@ if test "$bind10_inc_path" = "no"; then
         fi
     done
  fi
 -CPPFLAGS_SAVES="$CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
 +CPPFLAGS_SAVED="$CPPFLAGS"
  if test "${bind10_inc_path}" != "no"; then
     BIND10_CPPFLAGS="-I${bind10_inc_path}"
     CPPFLAGS="$CPPFLAGS $BIND10_CPPFLAGS"
  fi
  AC_CHECK_HEADERS([util/buffer.h],,
 -  AC_MSG_ERROR([Missing a commonly used BIND 10 header files]))
 -CPPFLAGS="$CPPFLAGS_SAVES"
 +  AC_MSG_ERROR([Missing a commonly used BIND 10 header file]))
 +CPPFLAGS="$CPPFLAGS_SAVED"
  AC_SUBST(BIND10_CPPFLAGS)

  # Check for BIND10 libraries
 -CPPFLAGS_SAVED="$CPPFLAGS"
 -CPPFLAGS="$CPPFLAGS $BIND10_CPPFLAGS"
 +CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS $BIND10_CPPFLAGS"

  AC_ARG_WITH(bind10-lib,
    AS_HELP_STRING([--with-bind10-lib=PATH],
 @@ -94,7 +94,7 @@ else
  fi

  # restore LIBS once at this point
 -LIBS="$LIBS_SAVES"
 +LIBS="$LIBS_SAVED"

  AC_SUBST(BIND10_LDFLAGS)
  AC_SUBST(BIND10_COMMON_LIB)
 @@ -111,12 +111,12 @@ isc::dns::RRType rrtype(1);
  ], [BIND10_DNS_LIB="-lb10-dns++"
      AC_MSG_RESULT(yes)],
     [AC_MSG_RESULT(no)])
 -LIBS="$LIBS_SAVES"
 +LIBS="$LIBS_SAVED"
  AC_SUBST(BIND10_DNS_LIB)

  # Restore other flags
  CPPFLAGS="$CPPFLAGS_SAVED"
 -LDFLAGS="$LDFLAGS_SAVES"
 +LDFLAGS="$LDFLAGS_SAVED"

  AC_LANG_RESTORE
  ])dnl AX_ISC_BIND10
 }}}

 The above fixes it for me on two different systems.

 The next problem is that on some systems it can't run b10-host since can't
 find the library.  We have a rpath_flag in the base configure.ac which
 could be reused -- we should abstract that out.

-- 
Ticket URL: <http://bind10.isc.org/ticket/2356>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development