MonetDB: default - Merge with Apr2011 branch.

[Stefan Manegold]

Changeset: 5a8e7f574881 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a8e7f574881
Modified Files:
        configure.ag
Branch: default
Log Message:

Merge with Apr2011 branch.


diffs (113 lines):

diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -151,6 +151,7 @@
        ;;
 no-auto)
        enable_monetdb5=no
+       disable_monetdb5="(MonetDB5 requires GDK.)"
        ;;
 esac
 
@@ -180,6 +181,7 @@
        ;;
 no-auto)
        enable_sql=no
+       disable_sql="(MonetDB/SQL requires MonetDB5.)"
        ;;
 esac
 
@@ -195,6 +197,7 @@
        ;;
 no-auto)
        enable_geom=no
+       disable_geom="(geom module requires MonetDB5)"
        ;;
 esac
 
@@ -259,6 +262,8 @@
 else
        enable_jdbc=no
        enable_control=no
+       disable_jdbc="(as java is disabled)"
+       disable_control="(as java is disabled)"
 fi
 
 dnl RIPEMD160 is patent free, academic and European, but unfortunately
@@ -1581,6 +1586,9 @@
                AC_MSG_ERROR([MonetDB/SQL requires YACC or BISON.])
        fi
        enable_sql=no
+       if test "x$disable_sql" = x; then
+               disable_sql="(MonetDB/SQL requires YACC or BISON.)"
+       fi
 fi
 
 AC_CHECK_PROG(TEXI2HTML,texi2html,texi2html)
@@ -2115,6 +2123,9 @@
        ;;
 auto-no)
        enable_monetdb5=no
+       if test "x$disable_monetdb5" = x; then
+               disable_monetdb5="(OpenSSL library not found but required for 
MonetDB5)"
+       fi
        ;;
 esac
 
@@ -2144,6 +2155,9 @@
        ;;
 auto-no)
        enable_monetdb5=no
+       if test "x$disable_monetdb5" = x; then
+               disable_monetdb5="(PCRE library not found but required for 
MonetDB5)"
+       fi
        ;;
 esac
 
@@ -2155,6 +2169,9 @@
        ;;
 auto-no)
        enable_monetdb5=no
+       if test "x$disable_monetdb5" = x; then
+               disable_monetdb5="(libxml2 library not found but required for 
MonetDB5)"
+       fi
        ;;
 esac
 
@@ -2385,6 +2402,9 @@
                fi
                # no geos, so don't compile geom
                enable_geom=no
+               if test "x$disable_geom" = x; then
+                       disable_geom="(geos library required for geom module)"
+               fi
        fi
        ;;
 esac
@@ -2836,6 +2856,9 @@
 fi
 if test x"$enable_sql" = xauto && test x"$enable_monetdb5" = x"no" ; then
        enable_sql=no
+       if test "x$disable_sql" = x; then
+               disable_sql="(MonetDB/SQL requires MonetDB5)"
+       fi
 fi
 
 dnl     output
@@ -3146,8 +3169,15 @@
        control \
        testing \
 ; do
+       eval "dft=\$dft_$comp"
+       eval "enable=\$enable_$comp"
+       eval "disable=\$disable_$comp"
+       case "$disable-$enable-$dft" in
+               -no-no) disable="(by default)";;
+               -no-*)  disable="(by command line option)";;
+       esac
        echo $ECHO_N "    $comp is $ECHO_C"
-       eval "if test \"x\$enable_$comp\" = xno ; then echo 
\"${ECHO_T}disabled\"; else echo \"${ECHO_T}enabled\"; fi"
+       if test "x$enable" = xno ; then echo "${ECHO_T}disabled $disable"; else 
echo "${ECHO_T}enabled"; fi
 done
 echo
 echo "* Important options:"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list