[BACK]Return to configure.ac CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / mtr

Diff for /embedaddon/mtr/configure.ac between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2013/07/21 23:43:42 version 1.1.1.2, 2016/11/01 09:33:48
Line 1 Line 1
AC_INIT([mtr], [0.85])AC_INIT([mtr], [0.86])
 AC_CONFIG_SRCDIR([mtr.c])  AC_CONFIG_SRCDIR([mtr.c])
 AM_INIT_AUTOMAKE([foreign])  AM_INIT_AUTOMAKE([foreign])
   
Line 42  AC_ARG_WITH(gtk, Line 42  AC_ARG_WITH(gtk,
 [  --without-gtk           Do not try to use GTK+ at all],  [  --without-gtk           Do not try to use GTK+ at all],
 WANTS_GTK=$withval, WANTS_GTK=yes)  WANTS_GTK=$withval, WANTS_GTK=yes)
   
 AC_ARG_WITH(glib,  
 [  --without-glib          Do not try to use glib at all],  
 WANTS_GLIB=$withval, WANTS_GLIB=yes)  
   
 AC_ARG_WITH([ipinfo],  AC_ARG_WITH([ipinfo],
 [  --without-ipinfo        Do not try to use ipinfo lookup at all],  [  --without-ipinfo        Do not try to use ipinfo lookup at all],
[case "${withval}" in[ipinfo="${withval}"], [ipinfo=yes])
  yes) ipinfo=true ;;AM_CONDITIONAL([IPINFO], [test x$ipinfo = xyes])
  no)  ipinfo=false ;; 
  *) AC_MSG_ERROR([bad value ${withval} for --with-ipinfo]) ;; 
esac],[ipinfo=true]) 
AM_CONDITIONAL([IPINFO], [test x$ipinfo = xtrue]) 
if test "x$ipinfo" = "xfalse"; then 
        AC_DEFINE([NO_IPINFO], [1], [Define to disable ipinfo lookup]) 
fi 
   
 AC_ARG_ENABLE(ipv6,  AC_ARG_ENABLE(ipv6,
 [  --disable-ipv6          Do not enable IPv6],  [  --disable-ipv6          Do not enable IPv6],
 WANTS_IPV6=$enableval, WANTS_IPV6=yes)  WANTS_IPV6=$enableval, WANTS_IPV6=yes)
   
   m4_ifndef([AM_PATH_GTK_2_0], [m4_defun([AM_PATH_GTK_2_0], [AC_MSG_ERROR([
     Could not locate the gtk2 automake macros, these are usually located in
       .../share/aclocal/gtk-2.0.m4
     Before running bootstrap try setting the environment variable
       ACLOCAL_PATH="/own/dir"
     or configure --without-gtk.
   ])])])
         
 if test "x$WANTS_GTK" = "xyes"; then  if test "x$WANTS_GTK" = "xyes"; then
         AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"          AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
Line 71  if test "x$WANTS_GTK" = "xyes"; then Line 68  if test "x$WANTS_GTK" = "xyes"; then
 else  else
         AC_DEFINE(NO_GTK)          AC_DEFINE(NO_GTK)
         GTK_OBJ=""          GTK_OBJ=""
        if test "x$WANTS_GLIB" = "xyes"; thenfi
                PKG_CHECK_MODULES([GLIB], [glib-2.0])
        elseif test "x$ipinfo" = "xno"; then
                AC_DEFINE(NO_GLIB, 1, [Define if you don't have the glib libraries available.])        AC_DEFINE([NO_IPINFO], [1], [Define to disable ipinfo lookup])
        fi 
 fi  fi
   
 AC_CHECK_FUNC(socket, ,   AC_CHECK_FUNC(socket, , 
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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