Jiri Skala 64f1ae6
commit 36de261b57eab7a7539fb6527a1f02f3898cbafd
Jiri Skala 64f1ae6
Author: Paul Jakma <paul@quagga.net>
Jiri Skala 64f1ae6
Date:   Tue Mar 22 10:18:05 2011 +0000
Jiri Skala 64f1ae6
Jiri Skala 64f1ae6
    build: change sense of opaque-{lsa,te} enable args to enable by default
Jiri Skala 64f1ae6
    
Jiri Skala 64f1ae6
    * configure.ac: (AC_ARG_ENABLE({ospf-te,opaque-lsa})) reverse the sense to
Jiri Skala 64f1ae6
      --disable
Jiri Skala 64f1ae6
      (enable_{opaque_lsa,ospf_te}) treat as enabled unless explicitly disabled.
Jiri Skala 64f1ae6
Jiri Skala 64f1ae6
diff --git a/configure.ac b/configure.ac
Jiri Skala 64f1ae6
index 4409d20..27d26ef 100755
Jiri Skala 64f1ae6
--- a/configure.ac
Jiri Skala 64f1ae6
+++ b/configure.ac
Jiri Skala 64f1ae6
@@ -219,15 +219,14 @@ AC_ARG_WITH(libpam,
Jiri Skala 64f1ae6
 AC_ARG_ENABLE(tcp-zebra,
Jiri Skala 64f1ae6
 [  --enable-tcp-zebra      enable TCP/IP socket connection between zebra and protocol daemon])
Jiri Skala 64f1ae6
 AC_ARG_ENABLE(opaque-lsa,
Jiri Skala 64f1ae6
-[  --enable-opaque-lsa     enable OSPF Opaque-LSA with OSPFAPI support (RFC2370)])
Jiri Skala 64f1ae6
+  AC_HELP_STRING([--disable-opaque-lsa],[do not build OSPF Opaque-LSA with OSPFAPI support (RFC2370)]))
Jiri Skala 64f1ae6
 AC_ARG_ENABLE(ospfapi,
Jiri Skala 64f1ae6
-[  --disable-ospfapi       do not build OSPFAPI to access the OSPF LSA Database, 
Jiri Skala 64f1ae6
-                          (this is the default if --enable-opaque-lsa is not set)])
Jiri Skala 64f1ae6
+[  --disable-ospfapi       do not build OSPFAPI to access the OSPF LSA Database])
Jiri Skala 64f1ae6
 AC_ARG_ENABLE(ospfclient,
Jiri Skala 64f1ae6
 [  --disable-ospfclient    do not build OSPFAPI client for OSPFAPI, 
Jiri Skala 64f1ae6
                           (this is the default if --disable-ospfapi is set)])
Jiri Skala 64f1ae6
 AC_ARG_ENABLE(ospf-te,
Jiri Skala 64f1ae6
-[  --enable-ospf-te        enable Traffic Engineering Extension to OSPF])
Jiri Skala 64f1ae6
+  AC_HELP_STRING([--disable-ospf-te],[disable Traffic Engineering Extension to OSPF]))
Jiri Skala 64f1ae6
 AC_ARG_ENABLE(multipath,
Jiri Skala 64f1ae6
 [  --enable-multipath=ARG  enable multipath function, ARG must be digit])
Jiri Skala 64f1ae6
 AC_ARG_ENABLE(user,
Jiri Skala 64f1ae6
@@ -292,11 +291,11 @@ if test "${enable_tcp_zebra}" = "yes"; then
Jiri Skala 64f1ae6
   AC_DEFINE(HAVE_TCP_ZEBRA,,Use TCP for zebra communication)
Jiri Skala 64f1ae6
 fi
Jiri Skala 64f1ae6
 
Jiri Skala 64f1ae6
-if test "${enable_opaque_lsa}" = "yes"; then
Jiri Skala 64f1ae6
+if test "${enable_opaque_lsa}" != "no"; then
Jiri Skala 64f1ae6
   AC_DEFINE(HAVE_OPAQUE_LSA,,OSPF Opaque LSA)
Jiri Skala 64f1ae6
 fi
Jiri Skala 64f1ae6
 
Jiri Skala 64f1ae6
-if test "${enable_ospf_te}" = "yes"; then
Jiri Skala 64f1ae6
+if test "${enable_ospf_te}" != "no"; then
Jiri Skala 64f1ae6
   AC_DEFINE(HAVE_OPAQUE_LSA,,OSPF Opaque LSA)
Jiri Skala 64f1ae6
   AC_DEFINE(HAVE_OSPF_TE,,OSPF TE)
Jiri Skala 64f1ae6
 fi