Changeset 109 for trunk

Show
Ignore:
Timestamp:
04/20/09 16:26:30 (14 years ago)
Author:
andreu
Message:

add doc directory in distrib
modify output order of configure help

Location:
trunk
Files:
1 removed
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.am

    r19 r109  
    11## Process this file with automake to produce makefile.in 
    2 EXTRA_DIST = tool conf 
     2EXTRA_DIST = tool conf doc 
    33SUBDIRS = src  

  • trunk/configure.in

    r95 r109  
    3535AC_TYPE_SIZE_T 
    3636 
    37 AC_ARG_ENABLE(optimize,[  --enable-optimize gcc O2 option compilation default=no], 
    38 optimize=$enableval,optimize=no) 
    39 if test $optimize = yes ; then 
    40 CFLAGS="$CFLAGS $CFLAGS_OPTIMIZE" 
     37AC_ARG_ENABLE(ipv4aggidsnmp,[  --enable-ipv4aggidsnmp aggregation for IPv4 prefix, localisation based on SNMP ID=yes], 
     38ipv4aggidsnmp=$enableval,ipv4aggidsnmp=yes) 
     39if test $ipv4aggidsnmp = yes ; then 
     40CFLAGS="$CFLAGS $CFLAGS_IPV4AGGIDSNMP" 
     41fi 
     42 
     43AC_ARG_ENABLE(ipv4aggidr,[  --enable-ipv4aggidr aggregation for IPv4 prefix=no, flow localisation by routeur identification, if yes, enable-ipv4aggsnmp MUST be NO], 
     44ipv4aggidr=$enableval,ipv4aggidr=no) 
     45if test $ipv4aggidr = yes ; then 
     46CFLAGS="$CFLAGS $CFLAGS_IPV4AGGIDR" 
     47fi 
     48 
     49AC_ARG_ENABLE(multisampling,[  --enable-multisampling Multi-Sampling mode=no], 
     50multisampling=$enableval,multisampling=no) 
     51if test $multisampling = yes ; then 
     52CFLAGS="$CFLAGS $CFLAGS_MULTISAMPLING" 
    4153fi 
    4254 
    … …  
    5365fi 
    5466 
    55 AC_ARG_ENABLE(ipv4aggidr,[  --enable-ipv4aggidr aggregation for IPv4 prefix=no, flow localisation by routeur identification, if yes, enable-ipv4aggsnmp MUST be NO], 
    56 ipv4aggidr=$enableval,ipv4aggidr=no) 
    57 if test $ipv4aggidr = yes ; then 
    58 CFLAGS="$CFLAGS $CFLAGS_IPV4AGGIDR" 
    59 fi 
    60  
    61 AC_ARG_ENABLE(ipv4aggidsnmp,[  --enable-ipv4aggidsnmp aggregation for IPv4 prefix, localisation based on SNMP ID=yes], 
    62 ipv4aggidsnmp=$enableval,ipv4aggidsnmp=yes) 
    63 if test $ipv4aggidsnmp = yes ; then 
    64 CFLAGS="$CFLAGS $CFLAGS_IPV4AGGIDSNMP" 
     67AC_ARG_ENABLE(optimize,[  --enable-optimize gcc O2 option compilation default=no], 
     68optimize=$enableval,optimize=no) 
     69if test $optimize = yes ; then 
     70CFLAGS="$CFLAGS $CFLAGS_OPTIMIZE" 
    6571fi 
    6672 
    … …  
    8995fi 
    9096 
    91  
    92 AC_ARG_ENABLE(multisampling,[  --enable-multisampling Multi-Sampling mode=no], 
    93 multisampling=$enableval,multisampling=no) 
    94 if test $multisampling = yes ; then 
    95 CFLAGS="$CFLAGS $CFLAGS_MULTISAMPLING" 
    96 fi 
    97  
    9897AC_ARG_ENABLE(printunknownsubnet,[  --enable-printunknownsubnet Print Subnets who are not registered in subnet configuration file=no], 
    9998printunknownsubnet=$enableval,printunknownsubnet=no)