[BACK]Return to configure.in CVS log [TXT] [DIR] Up to [local] / rpl

Diff for /rpl/Attic/configure.in between versions 1.30 and 1.31

version 1.30, 2010/07/25 18:15:37 version 1.31, 2010/07/31 10:34:15
Line 9  AC_CONFIG_HEADERS([rplconfig.h]) Line 9  AC_CONFIG_HEADERS([rplconfig.h])
 dnl Libraries  dnl Libraries
 NCURSES=ncurses-5.7-20100619  NCURSES=ncurses-5.7-20100619
 READLINE=readline-6.1  READLINE=readline-6.1
 UNITS=units-1.87  UNITS=units-1.88
 GSL=gsl-1.14  GSL=gsl-1.14
 GPP=gpp-2.24  GPP=gpp-2.24
 GNUPLOT=gnuplot-4.4.0  GNUPLOT=gnuplot-4.4.0
 FILE=file-5.03  FILE=file-5.03
 ICONV=libiconv-1.13.1  ICONV=libiconv-1.13.1
 SQLITE=sqlite-3.6.23.1  SQLITE=sqlite-3.7.0
 OPENSSL=openssl-1.0.0a  OPENSSL=openssl-1.0.0a
   
 dnl Checks for C compiler  dnl Checks for C compiler
 AC_PROG_CC(gcc)  AC_PROG_CC(gcc)
   
   EXT_SQL=
   
 if test x"$CC" != x""; then  if test x"$CC" != x""; then
     GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \      GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \
             awk -F. '{ printf("%s", $1);}'`              awk -F. '{ printf("%s", $1);}'`
Line 124  fi],[ Line 126  fi],[
     ]      ]
 )  )
   
   AC_ARG_ENABLE(full-static,
   [  --enable-full-static    build static RPL/2 engine [[default=shared]]], [
   if test "$enableval" = "no"; then
       STATIC=no
   else
       STATIC=yes
   fi],
   STATIC=no)
   
 AC_ARG_ENABLE(final-encoding,  AC_ARG_ENABLE(final-encoding,
 [  --enable-final-encoding force final encoding [[default=guessed]]], [  [  --enable-final-encoding force final encoding [[default=guessed]]], [
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
Line 470  AC_ARG_WITH(mysql, Line 481  AC_ARG_WITH(mysql,
   
 if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then  if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then
     libMySQLinc="-I/usr/include"      libMySQLinc="-I/usr/include"
     libMySQLlib="-L/usr/lib"      libMySQLlib="/usr/lib"
   
     AC_MSG_CHECKING(for libmysql includes in /usr/include)      AC_MSG_CHECKING(for libmysql includes in /usr/include)
     saved_CFLAGS="$CFLAGS"      saved_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $libMySQLinc"      CFLAGS="$CFLAGS -L/$libMySQLinc"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[]])],[AC_MSG_RESULT([yes]); MYSQL_SUPPORT="-DMYSQL_SUPPORT";
                     libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])                      libMySQLinc=$libMySQLinc/mysql],[AC_MSG_RESULT([no]); MYSQL_SUPPORT="-UMYSQL_SUPPORT"])
     CFLAGS=$saved_CFLAGS      CFLAGS=$saved_CFLAGS
Line 513  if test "x$with_mysql" = xcheck -o "x$wi Line 524  if test "x$with_mysql" = xcheck -o "x$wi
 else  else
     if test "x$with_mysql" != xno; then      if test "x$with_mysql" != xno; then
         libMySQLinc="-I$with_mysql/include"          libMySQLinc="-I$with_mysql/include"
         libMySQLlib="-L$with_mysql/lib"          libMySQLlib="$with_mysql/lib"
   
         AC_MSG_CHECKING(for libmysql includes in $with_mysql)          AC_MSG_CHECKING(for libmysql includes in $with_mysql)
         saved_CFLAGS="$CFLAGS"          saved_CFLAGS="$CFLAGS"
Line 542  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP Line 553  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
     if test $MYSQL_LIB = no; then      if test $MYSQL_LIB = no; then
         AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib)          AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib)
         saved_LIBS="$LIBS"          saved_LIBS="$LIBS"
         LIBS="$LIBS $libMySQLlib $libMySQLinc -lmysqlclient_r"          if test $STATIC = no; then
               LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"
           else
               LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc"
           fi
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[MYSQL mysql; mysql_init(&mysql);]])],[AC_MSG_RESULT([yes]); MYSQL_LIB="yes"],[AC_MSG_RESULT([no]); MYSQL_LIB="no"])          AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "mysql.h"]], [[MYSQL mysql; mysql_init(&mysql);]])],[AC_MSG_RESULT([yes]); MYSQL_LIB="yes"],[AC_MSG_RESULT([no]); MYSQL_LIB="no"])
         LIBS=$saved_LIBS;          LIBS=$saved_LIBS;
         libMySQLlib="$libMySQLlib -lmysqlclient_r"          if test $STATIC = no; then
               libMySQLlib="-L/$libMySQLlib -lmysqlclient_r"
           else
               libMySQLlib="$libMySQLlib/libmysqlclient_r.a"
               EXT_SQL="$EXT_SQL $libMySQLlib"
           fi
     fi      fi
   
     if test $MYSQL_LIB = no; then      if test $MYSQL_LIB = no; then
Line 572  AC_ARG_WITH(postgresql, Line 592  AC_ARG_WITH(postgresql,
   
 if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then  if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then
     libPgSQLinc="-I/usr/include"      libPgSQLinc="-I/usr/include"
     libPgSQLlib="-L/usr/lib"      libPgSQLlib="/usr/lib"
   
     AC_MSG_CHECKING(for libpq includes in /usr/include)      AC_MSG_CHECKING(for libpq includes in /usr/include)
     saved_CFLAGS="$CFLAGS"      saved_CFLAGS="$CFLAGS"
Line 640  if test "x$with_postgresql" = xcheck -o Line 660  if test "x$with_postgresql" = xcheck -o
 else  else
     if test "x$with_postgresql" != xno; then      if test "x$with_postgresql" != xno; then
         libPgSQLinc="-I$with_postgresql/include"          libPgSQLinc="-I$with_postgresql/include"
         libPgSQLlib="-L$with_postgresql/lib"          libPgSQLlib="$with_postgresql/lib"
   
         AC_MSG_CHECKING(for libpq includes in $libPgSQLinc)          AC_MSG_CHECKING(for libpq includes in $libPgSQLinc)
         saved_CFLAGS="$CFLAGS"          saved_CFLAGS="$CFLAGS"
Line 682  if test "$POSTGRESQL_SUPPORT" = "-DPOSTG Line 702  if test "$POSTGRESQL_SUPPORT" = "-DPOSTG
     if test $POSTGRESQL_LIB = no; then      if test $POSTGRESQL_LIB = no; then
         AC_MSG_CHECKING(for libpq libraries in $libPgSQLlib)          AC_MSG_CHECKING(for libpq libraries in $libPgSQLlib)
         saved_LIBS="$LIBS"          saved_LIBS="$LIBS"
         LIBS="$LIBS $libPgSQLlib $libPgSQLinc -lpq"          if test $STATIC = no; then
               LIBS="$LIBS -L/$libPgSQLlib $libPgSQLinc -lpq"
           else
               LIBS="$LIBS $libPgSQLlib/libpq.a $libPgSQLinc"
           fi
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "libpq-fe.h"]], [[PGconn *conn; const char *conninfo="dbname=postgres"; conn =          AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "libpq-fe.h"]], [[PGconn *conn; const char *conninfo="dbname=postgres"; conn =
              PQconnectdb(conninfo);]])],[AC_MSG_RESULT([yes]); POSTGRESQL_LIB="yes"],[AC_MSG_RESULT([no]); POSTGRESQL_LIB="no"])               PQconnectdb(conninfo);]])],[AC_MSG_RESULT([yes]); POSTGRESQL_LIB="yes"],[AC_MSG_RESULT([no]); POSTGRESQL_LIB="no"])
         LIBS=$saved_LIBS;          LIBS=$saved_LIBS;
         libPgSQLlib="$libPgSQLlib -lpq"          if test $STATIC = no; then
               libPgSQLlib="-L/$libPgSQLlib -lpq"
           else
               libPgSQLlib="$libPgSQLlib/libpq.a"
               EXT_SQL="$EXT_SQL $libPgSQLlib"
           fi
     fi      fi
 fi  fi
   
Line 886  AC_SUBST(FINAL_ENCODING) Line 915  AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)  AC_SUBST(DATE)
 AC_SUBST(DATE_FR)  AC_SUBST(DATE_FR)
 AC_SUBST(MALLOC)  AC_SUBST(MALLOC)
   AC_SUBST(EXT_SQL)
   
 AC_SUBST(CFLAGS)  AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)  AC_SUBST(CXXFLAGS)
Removed from v.1.30  
changed lines
  Added in v.1.31

CVSweb interface <joel.bertrand@systella.fr>