fix bug with ipsecola config

diff --git a/configure.ac b/configure.ac
index 7b06a98af968d311f22283626d09c520877574a4..2ec6b02980c6f958ee9e8a3b393e6c265cc855be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1373,7 +1373,12 @@ AC_ARG_WITH(digcola,
   [AC_HELP_STRING([--with-digcola],
                   [with DIGCOLA features in neato layout engine])])
 
+### default is to build with digcola
 if test "x$with_digcola" != "xno"; then
+       with_digcola=yes
+fi
+
+if test "x$with_digcola" == "xyes"; then
        AC_DEFINE_UNQUOTED(DIGCOLA,1,[Define if you want DIGCOLA])
 else
        AC_MSG_WARN(Optional DIGCOLA is disabled)
@@ -1386,10 +1391,16 @@ AC_ARG_WITH(ipsepcola,
                   [with IPSEPCOLA features in neato layout engine])])
 
 
-if test "x$with_digcola" != "xno"; then
+### default is to build with digcola
+if test "x$with_ipsepcola" != "xno"; then
        with_ipsepcola=yes
 fi
 
+### unless digcola was not enabled since ipsecola depends on it
+if test "x$with_digcola" == "xno"; then
+       with_ipsepcola=no
+fi
+
 if test "x$with_ipsepcola" = "xyes"; then
        AC_DEFINE_UNQUOTED(IPSEPCOLA,1,[Define if you want IPSEPCOLA])
        IPSEPCOLA_INCLUDES='-I$(top_srcdir)/lib/vpsc'