Update of /cvsroot/monetdb/pathfinder
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22592

Modified Files:
      Tag: M5XQ
        configure.ag 
Log Message:
propagated changes of Thursday Mar 18 2010
from the XQFT branch to the M5XQ branch

  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2010/03/18 - sjoerd: configure.ag,1.155.2.6
  propagated changes of Wednesday Mar 17 2010 - Thursday Mar 18 2010
  from the development trunk to the XQFT branch
  
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2010/03/17 - sjoerd: configure.ag,1.162
    AC_HELP_STRING has long ago been superseded by AS_HELP_STRING.
    Require autoconf 2.60 everywhere, not just for most configure.a[cg] files.
    Added missing copyright notices.
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2010/03/18 - sjoerd: configure.ag,1.155.2.7
  propagated changes of Wednesday Mar 17 2010 - Thursday Mar 18 2010
  from the development trunk to the XQFT branch
  
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2010/03/17 - sjoerd: configure.ag,1.162
    AC_HELP_STRING has long ago been superseded by AS_HELP_STRING.
    Require autoconf 2.60 everywhere, not just for most configure.a[cg] files.
    Added missing copyright notices.
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2010/03/18 - mr-meltdown: configure.ag,1.163
    Check for C99 using AC_PROG_CC_C99
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/configure.ag,v
retrieving revision 1.145.2.12
retrieving revision 1.145.2.13
diff -u -d -r1.145.2.12 -r1.145.2.13
--- configure.ag        28 Jan 2010 13:01:33 -0000      1.145.2.12
+++ configure.ag        18 Mar 2010 11:44:33 -0000      1.145.2.13
@@ -77,7 +77,8 @@
 dnl must check for compiler before checking for MonetDB4
 AM_MONETDB_DEFAULTS()
 AM_MONETDB_COMPILER()
-if test "x$have_c99" != xyes; then
+AC_PROG_CC_C99()
+if test "x$ac_cv_prog_cc_c99" == xno; then
        AC_MSG_ERROR([Pathfinder requires a C99 compliant C compiler, but your 
C compiler does not seem to be C99 compliant.])
 fi
 
@@ -216,7 +217,7 @@
 
 if test -f "$srcdir"/vertoo.data; then
        AC_ARG_WITH(burg,
-               AC_HELP_STRING([--with-burg=FILE], [burg is installed as FILE]),
+               AS_HELP_STRING([--with-burg=FILE], [burg is installed as FILE]),
                have_burg="$withval",
                have_burg=auto)
        if test "x$have_burg" = xauto; then
@@ -338,7 +339,7 @@
 dnl see if we actually found libxml2.
 have_libxml2="auto"
 AC_ARG_WITH(libxml2,
-    AC_HELP_STRING([--with-libxml2=DIR],[libxml2 library is installed in DIR]),
+    AS_HELP_STRING([--with-libxml2=DIR],[libxml2 library is installed in DIR]),
     [have_libxml2="$withval"], [have_libxml2="auto"])
 have_SAX2="$have_libxml2"
 
@@ -440,7 +441,7 @@
 dnl Further down see if we find the library and abort if not.
 have_gc="auto"
 AC_ARG_WITH(gc,
-    AC_HELP_STRING([--with-gc=DIR],[Boehm garbage collector library is 
installed in DIR]),
+    AS_HELP_STRING([--with-gc=DIR],[Boehm garbage collector library is 
installed in DIR]),
     [have_gc="$withval"], [have_gc="auto"])
 
 if test "x$have_gc" != xauto; then
@@ -508,7 +509,7 @@
 
     dft_pftijah=yes
     AC_ARG_ENABLE(pftijah,
-            AC_HELP_STRING([--enable-pftijah],
+            AS_HELP_STRING([--enable-pftijah],
                     [enable support for TIJAH (default=$dft_pftijah)]),
             enable_pftijah=$enableval,
             enable_pftijah=$dft_pftijah)
@@ -532,7 +533,7 @@
 
     dft_probxml=no
     AC_ARG_ENABLE(probxml,
-            AC_HELP_STRING([--enable-probxml],
+            AS_HELP_STRING([--enable-probxml],
                     [enable support for PROBXML (default=$dft_probxml)]),
             enable_probxml=$enableval,
             enable_probxml=$dft_probxml)
@@ -562,7 +563,7 @@
 dnl testing.  If you invoke configure with --with-default-backend=algebra,
 dnl Mtest will also use the algebraic back-end.
 AC_ARG_WITH(default-backend,
-            AC_HELP_STRING(
+            AS_HELP_STRING(
                [--with-default-backend=BACKEND],
                [select a default back-end (milprint_summer/algebra/sql)
                 for Pathfinder (default=algebra)]),


------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to