From: Mark Andrews <marka@isc.org>
Date: Thu, 11 May 2017 08:30:04 +0000 (+1000)
Subject: 4623.   [bug]           Use --with-protobuf-c and --with-libfstrm to find
X-Git-Tag: v9.12.0a1~294
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=366cff85a915c1f128d76ae9b4e85475e66e0b54;p=thirdparty%2Fbind9.git

4623.   [bug]           Use --with-protobuf-c and --with-libfstrm to find
                        protoc-c and fstrm_capture. [RT #45187]
---

diff --git a/CHANGES b/CHANGES
index 44e138290d9..164690400ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4623.	[bug]		Use --with-protobuf-c and --with-libfstrm to find
+			protoc-c and fstrm_capture. [RT #45187]
+
 4622.	[bug]		Remove unnecessary escaping of semicolon in CAA and
 			URI records. [RT #45216]
 
diff --git a/configure b/configure
index 399e309641c..a40b3a75882 100755
--- a/configure
+++ b/configure
@@ -705,8 +705,8 @@ DNSTAPTARGETS
 DNSTAPOBJS
 DNSTAPSRCS
 DNSTAP
-PROTOC_C
 FSTRM_CAPTURE
+PROTOC_C
 ISC_PLATFORM_BUSYWAITNOP
 ISC_ARCH_DIR
 ISC_PLATFORM_USEMACASM
@@ -20762,26 +20762,56 @@ esac
 #
 # Activate dnstap?
 #
-# Extract the first word of "fstrm_capture", so it can be a program name with args.
-set dummy fstrm_capture; ac_word=$2
+# Check whether --enable-dnstap was given.
+if test "${enable_dnstap+set}" = set; then :
+  enableval=$enable_dnstap; use_dnstap=$enableval
+else
+  use_dnstap=no
+fi
+
+
+DNSTAP=
+DNSTAPSRCS=
+DNSTAPOBJS=
+DNSTAPTARGETS=
+DNSTAP_PB_C_H=
+if test "x$use_dnstap" != "xno"; then
+	if ! $use_threads; then
+		as_fn_error $? "Dnstap requires threads." "$LINENO" 5
+	fi
+
+# Check whether --with-protobuf-c was given.
+if test "${with_protobuf_c+set}" = set; then :
+  withval=$with_protobuf_c;
+	    # workaround for protobuf-c includes at old dir
+	    # before protobuf-c-1.0.0
+	    if test -f $withval/include/google/protobuf-c/protobuf-c.h
+	    then
+		CFLAGS="$CFLAGS -I$withval/include/google"
+	    else
+		CFLAGS="$CFLAGS -I$withval/include"
+	    fi
+	    LDFLAGS="$LDFLAGS -L$withval/lib"
+	    # Extract the first word of "protoc-c", so it can be a program name with args.
+set dummy protoc-c; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_FSTRM_CAPTURE+:} false; then :
+if ${ac_cv_path_PROTOC_C+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $FSTRM_CAPTURE in
+  case $PROTOC_C in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_FSTRM_CAPTURE="$FSTRM_CAPTURE" # Let the user override the test with a path.
+  ac_cv_path_PROTOC_C="$PROTOC_C" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+for as_dir in $PATH$PATH_SEPARATOR$withval/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_FSTRM_CAPTURE="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_PROTOC_C="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -20792,34 +20822,32 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-FSTRM_CAPTURE=$ac_cv_path_FSTRM_CAPTURE
-if test -n "$FSTRM_CAPTURE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FSTRM_CAPTURE" >&5
-$as_echo "$FSTRM_CAPTURE" >&6; }
+PROTOC_C=$ac_cv_path_PROTOC_C
+if test -n "$PROTOC_C"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROTOC_C" >&5
+$as_echo "$PROTOC_C" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-# Check whether --enable-dnstap was given.
-if test "${enable_dnstap+set}" = set; then :
-  enableval=$enable_dnstap; use_dnstap=$enableval
-else
-  use_dnstap=no
-fi
 
+else
 
-DNSTAP=
-DNSTAPSRCS=
-DNSTAPOBJS=
-DNSTAPTARGETS=
-DNSTAP_PB_C_H=
-if test "x$use_dnstap" != "xno"; then
-	if ! $use_threads; then
-		as_fn_error $? "Dnstap requires threads." "$LINENO" 5
-	fi
-	# Extract the first word of "protoc-c", so it can be a program name with args.
+	    # workaround for protobuf-c includes at old dir
+	    # before protobuf-c-1.0.0
+	    if test -f /usr/include/google/protobuf-c/protobuf-c.h
+	    then
+		CFLAGS="$CFLAGS -I/usr/include/google"
+	    else
+		if test -f /usr/local/include/google/protobuf-c/protobuf-c.h
+		then
+		    CFLAGS="$CFLAGS -I/usr/local/include/google"
+		    LDFLAGS="$LDFLAGS -L/usr/local/lib"
+		fi
+	    fi
+	    # Extract the first word of "protoc-c", so it can be a program name with args.
 set dummy protoc-c; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -20859,46 +20887,101 @@ $as_echo "no" >&6; }
 fi
 
 
+
+fi
+
 	if test -z "$PROTOC_C"; then
 		as_fn_error $? "The protoc-c program was not found." "$LINENO" 5
 	fi
 
-# Check whether --with-protobuf-c was given.
-if test "${with_protobuf_c+set}" = set; then :
-  withval=$with_protobuf_c;
-	    # workaround for protobuf-c includes at old dir
-	    # before protobuf-c-1.0.0
-	    if test -f $withval/include/google/protobuf-c/protobuf-c.h
-	    then
-		CFLAGS="$CFLAGS -I$withval/include/google"
-	    else
-		CFLAGS="$CFLAGS -I$withval/include"
-	    fi
+# Check whether --with-libfstrm was given.
+if test "${with_libfstrm+set}" = set; then :
+  withval=$with_libfstrm;
+	    CFLAGS="$CFLAGS -I$withval/include"
 	    LDFLAGS="$LDFLAGS -L$withval/lib"
+	    # Extract the first word of "fstrm_capture", so it can be a program name with args.
+set dummy fstrm_capture; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FSTRM_CAPTURE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FSTRM_CAPTURE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FSTRM_CAPTURE="$FSTRM_CAPTURE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR$withval/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FSTRM_CAPTURE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+  ;;
+esac
+fi
+FSTRM_CAPTURE=$ac_cv_path_FSTRM_CAPTURE
+if test -n "$FSTRM_CAPTURE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FSTRM_CAPTURE" >&5
+$as_echo "$FSTRM_CAPTURE" >&6; }
 else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-	    # workaround for protobuf-c includes at old dir
-	    # before protobuf-c-1.0.0
-	    if test -f /usr/include/google/protobuf-c/protobuf-c.h
-	    then
-		CFLAGS="$CFLAGS -I/usr/include/google"
-	    else
-		if test -f /usr/local/include/google/protobuf-c/protobuf-c.h
-		then
-		    CFLAGS="$CFLAGS -I/usr/local/include/google"
-		    LDFLAGS="$LDFLAGS -L/usr/local/lib"
-		fi
-	    fi
 
+
+else
+
+	    # Extract the first word of "fstrm_capture", so it can be a program name with args.
+set dummy fstrm_capture; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FSTRM_CAPTURE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FSTRM_CAPTURE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FSTRM_CAPTURE="$FSTRM_CAPTURE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FSTRM_CAPTURE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+FSTRM_CAPTURE=$ac_cv_path_FSTRM_CAPTURE
+if test -n "$FSTRM_CAPTURE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FSTRM_CAPTURE" >&5
+$as_echo "$FSTRM_CAPTURE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
-# Check whether --with-libfstrm was given.
-if test "${with_libfstrm+set}" = set; then :
-  withval=$with_libfstrm;
-	    CFLAGS="$CFLAGS -I$withval/include"
-	    LDFLAGS="$LDFLAGS -L$withval/lib"
 
 fi
 
diff --git a/configure.in b/configure.in
index bf388ff48dc..737b1c12100 100644
--- a/configure.in
+++ b/configure.in
@@ -4313,7 +4313,6 @@ esac
 #
 # Activate dnstap?
 #
-AC_PATH_PROG(FSTRM_CAPTURE, fstrm_capture)
 AC_ARG_ENABLE(dnstap,
 	[  --enable-dnstap         enable dnstap support (requires fstrm, protobuf-c)],
                         use_dnstap=$enableval,
@@ -4328,10 +4327,6 @@ if test "x$use_dnstap" != "xno"; then
 	if ! $use_threads; then
 		AC_MSG_ERROR([Dnstap requires threads.])
 	fi
-	AC_PATH_PROG([PROTOC_C], [protoc-c])
-	if test -z "$PROTOC_C"; then
-		AC_MSG_ERROR([The protoc-c program was not found.])
-	fi
 	AC_ARG_WITH([protobuf-c],
 		    AC_HELP_STRING([--with-protobuf-c=path],
 				   [Path where protobuf-c is installed, for dnstap]), [
@@ -4344,6 +4339,8 @@ if test "x$use_dnstap" != "xno"; then
 		CFLAGS="$CFLAGS -I$withval/include"
 	    fi
 	    LDFLAGS="$LDFLAGS -L$withval/lib"
+	    AC_PATH_PROG([PROTOC_C], [protoc-c], [],
+			 [$PATH$PATH_SEPARATOR$withval/bin])
 	], [
 	    # workaround for protobuf-c includes at old dir
 	    # before protobuf-c-1.0.0
@@ -4357,11 +4354,18 @@ if test "x$use_dnstap" != "xno"; then
 		    LDFLAGS="$LDFLAGS -L/usr/local/lib"
 		fi
 	    fi
+	    AC_PATH_PROG([PROTOC_C],[protoc-c])
 	])
+	if test -z "$PROTOC_C"; then
+		AC_MSG_ERROR([The protoc-c program was not found.])
+	fi
 	AC_ARG_WITH([libfstrm], AC_HELP_STRING([--with-libfstrm=path],
 		    [Path where libfstrm is installed, for dnstap]), [
 	    CFLAGS="$CFLAGS -I$withval/include"
 	    LDFLAGS="$LDFLAGS -L$withval/lib"
+	    AC_PATH_PROG([FSTRM_CAPTURE], [fstrm_capture], [], [$PATH$PATH_SEPARATOR$withval/bin])
+	],[
+	    AC_PATH_PROG([FSTRM_CAPTURE], [fstrm_capture])
 	])
 
 	AC_SEARCH_LIBS([fstrm_iothr_init], [fstrm], [],