Diff for /embedaddon/mtr/configure between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2016/11/01 09:33:48 version 1.1.1.3, 2016/11/01 09:44:48
Line 626  LIBOBJS Line 626  LIBOBJS
 RESOLV_LIBS  RESOLV_LIBS
 GTK_LIBS  GTK_LIBS
 GTK_CFLAGS  GTK_CFLAGS
   PKG_CONFIG_LIBDIR
   PKG_CONFIG_PATH
 PKG_CONFIG  PKG_CONFIG
 IPINFO_FALSE  IPINFO_FALSE
 IPINFO_TRUE  IPINFO_TRUE
Line 734  CFLAGS Line 736  CFLAGS
 LDFLAGS  LDFLAGS
 LIBS  LIBS
 CPPFLAGS  CPPFLAGS
CPP'CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR'
   
   
 # Initialize some variables set by options.  # Initialize some variables set by options.
Line 1373  Some influential environment variables: Line 1378  Some influential environment variables:
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if    CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>                you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor    CPP         C preprocessor
     PKG_CONFIG  path to pkg-config utility
     PKG_CONFIG_PATH
                 directories to add to pkg-config's search path
     PKG_CONFIG_LIBDIR
                 path overriding pkg-config's built-in search path
   
 Use these variables to override the choices made by `configure' or to help  Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.  it to find libraries and programs with nonstandard names/locations.
Line 2437  ac_compiler_gnu=$ac_cv_c_compiler_gnu Line 2447  ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
   
   
am__api_version='1.14'am__api_version='1.15'
   
 ac_aux_dir=  ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
Line 2638  test "$program_suffix" != NONE && Line 2648  test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'  ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`  program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
   
# expand $ac_aux_dir to an absolute path# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd $ac_aux_dir && pwd`am_aux_dir=`cd "$ac_aux_dir" && pwd`
   
 if test x"${MISSING+set}" != xset; then  if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in    case $am_aux_dir in
Line 2658  else Line 2668  else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}  $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi  fi
   
if test x"${install_sh}" != xset; thenif test x"${install_sh+set}" != xset; then
   case $am_aux_dir in    case $am_aux_dir in
   *\ * | *\     *)    *\ * | *\     *)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;      install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
Line 2986  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} Line 2996  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>  # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'  mkdir_p='$(MKDIR_P)'
   
# We need awk for the "check" target.  The system "awk" is bad on# We need awk for the "check" target (and possibly the TAP driver).  The
# some platforms.# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used  # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...  # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'  AMTAR='$${TAR-tar}'
Line 3045  END Line 3055  END
   fi    fi
 fi  fi
   
   
 ac_config_files="$ac_config_files version.h.tmp:version.h.in"  ac_config_files="$ac_config_files version.h.tmp:version.h.in"
   
   
Line 4995  fi Line 5006  fi
   
   
 if test "x$WANTS_GTK" = "xyes"; then  if test "x$WANTS_GTK" = "xyes"; then
        # Check whether --enable-gtktest was given.
 
 
 
 
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$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
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
     PKG_CONFIG=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi
 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
 fi
 if test -n "$PKG_CONFIG"; then
         _pkg_min_version=0.9.0
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
         if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
         else
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 PKG_CONFIG=""
         fi
 fi
 # Check whether --enable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then :  if test "${enable_gtktest+set}" = set; then :
   enableval=$enable_gtktest;    enableval=$enable_gtktest;
 else  else
Line 5015  fi Line 5146  fi
   
   no_gtk=""    no_gtk=""
   
  # Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
 
 
 
 
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
         if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }  $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PKG_CONFIG+:} false; then :  if ${ac_cv_path_PKG_CONFIG+:} false; then :
Line 5042  done Line 5183  done
   done    done
 IFS=$as_save_IFS  IFS=$as_save_IFS
   
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"  
   ;;    ;;
 esac  esac
 fi  fi
Line 5056  $as_echo "no" >&6; } Line 5196  $as_echo "no" >&6; }
 fi  fi
   
   
   fi
   if test -z "$ac_cv_path_PKG_CONFIG"; then
     ac_pt_PKG_CONFIG=$PKG_CONFIG
     # Extract the first word of "pkg-config", so it can be a program name with args.
   set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
     $as_echo_n "(cached) " >&6
   else
     case $ac_pt_PKG_CONFIG in
     [\\/]* | ?:[\\/]*)
     ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # 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_ac_pt_PKG_CONFIG="$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
   
  if test x$PKG_CONFIG != xno ; then  ;;
    if pkg-config --atleast-pkgconfig-version 0.7 ; thenesac
      :fi
    elseac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
      echo "*** pkg-config too old; version 0.7 or better required."if test -n "$ac_pt_PKG_CONFIG"; then
      no_gtk=yes  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
      PKG_CONFIG=no$as_echo "$ac_pt_PKG_CONFIG" >&6; }
    fielse
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
     PKG_CONFIG=""
   else    else
    no_gtk=yes    case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
   fi    fi
   else
     PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
   fi
   
   fi
   if test -n "$PKG_CONFIG"; then
           _pkg_min_version=0.7
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
   $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
           if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   $as_echo "yes" >&6; }
           else
                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   $as_echo "no" >&6; }
                   PKG_CONFIG=""
           fi
   fi
   
   min_gtk_version=2.6.0    min_gtk_version=2.6.0
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>