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

Diff for /rpl/configure.ac between versions 1.22 and 1.100

version 1.22, 2012/04/02 09:50:39 version 1.100, 2014/07/21 09:12:33
Line 1 Line 1
 dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
 AC_INIT([rpl],[4.1.7])  AC_INIT([rpl],[4.1.19])
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)  AM_INIT_AUTOMAKE(silent-rules)
Line 9  AC_CONFIG_HEADERS([rplconfig.h]) Line 9  AC_CONFIG_HEADERS([rplconfig.h])
   
 dnl Libraries  dnl Libraries
 NCURSES=ncurses-5.9  NCURSES=ncurses-5.9
 READLINE=readline-6.2  READLINE=readline-6.3
 UNITS=units-1.88  UNITS=units-2.02
 GSL=gsl-1.15  GSL=gsl-1.16
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-4.6.0  GNUPLOT=gnuplot-4.6.5
 FILE=file-5.03  FILE=file-5.11
 ICONV=libiconv-1.13.1  ICONV=libiconv-1.14
 SQLITE=sqlite-3.7.11  SQLITE=sqlite-3.8.5
 OPENSSL=openssl-1.0.1  OPENSSL=openssl-1.0.1h
 OPENMOTIF=openmotif-2.3.3  OPENMOTIF=openmotif-2.3.4
 LIBXPM=libXpm-3.5.9  LIBXPM=libXpm-3.5.9
 SIGSEGV=libsigsegv-2.6  SIGSEGV=libsigsegv-2.11
   ZLIB=zlib-1.2.7
   
 GMP=gmp-5.0.2  GMP=gmp-6.0.0
 MPFR=mpfr-3.0.1  MPFR=mpfr-3.1.2
 NTL=ntl-5.5.2  NTL=ntl-5.5.2
 COCOA=CoCoALib-0.9943  COCOA=CoCoALib-0.9950
 PARI=pari-2.5.0  PARI=pari-2.5.4
 GIAC=giac-0.9.5  GIAC=giac-1.1.0
   
   dnl 32 bits ABI
   AC_ARG_WITH(gcc_version,
   [  --with-gcc-version      force gcc version],[
   CC=gcc-$with_gcc_version
   CXX=g++-$with_gcc_version
   CF=gfortran-$with_gcc_version
   F77=gfortran-$with_gcc_version
   AC_SUBST(CC)
   AC_SUBST(CXX)
   AC_SUBST(CF)
   AC_SUBST(F77)
   ],[])
   
   dnl Checks for Bash
   BASH_PATH=$(which bash)
   BASH=$(which bash | sed 's/\//\\\//g')
   
   if test x$BASH = x; then
       AC_MSG_ERROR([Cannot find bash! You have to install it.])
   fi
   
   AC_SUBST(BASH)
   AC_SUBST(BASH_PATH)
   
 dnl Checks for C compiler  dnl Checks for C compiler
 AC_PROG_CC(gcc)  AC_PROG_CC(gcc)
   
 EXT_SQL=  EXT_SQL=
   
 if test x"$CC" != x""; then  
     GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \  
             awk -F. '{ printf("%s", $1);}'`  
     GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \  
             awk -F. '{ printf("%s", $2);}'`  
     if test $GCC_VERSION_MAJEURE -ge 5; then  
         OPTIMISATION_C=-O3  
     else  
         if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; \  
                 then  
             OPTIMISATION_C=-O3  
         else  
             if test $GCC_VERSION_MAJEURE -ge 2; then  
                 OPTIMISATION_C=-O2  
             else  
                 AC_MSG_ERROR([Cannot find decent or recent gcc (gcc-4.2 or better)!])  
             fi  
         fi  
     fi  
 fi  
   
 AM_PROG_CC_C_O  AM_PROG_CC_C_O
   
 if test "$GCC" != yes; then  if test "$GCC" != yes; then
Line 68  if test "$GXX" != yes; then Line 72  if test "$GXX" != yes; then
     AC_MSG_ERROR([Cannot find g++! You have to install it.])      AC_MSG_ERROR([Cannot find g++! You have to install it.])
 fi  fi
   
 if test x"$CXX" != x""; then  
     GCC_VERSION_MAJEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \  
             awk -F. '{ printf("%s", $1);}'`  
     GCC_VERSION_MINEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \  
             awk -F. '{ printf("%s", $2);}'`  
     if test $GCC_VERSION_MAJEURE -ge 5; then  
         OPTIMISATION_GXX=-O3  
     else  
         if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then  
             OPTIMISATION_GXX=-O3  
         else  
             if test $GCC_VERSION_MAJEURE -ge 3; then  
                 OPTIMISATION_GXX=-O2  
             else  
                 AC_MSG_ERROR([Cannot find decent or recent g++ (g++-4.3 or better)!])  
             fi  
         fi  
     fi  
 fi  
   
 dnl Checks for Fortran 77 compiler  dnl Checks for Fortran 77 compiler
 AC_PROG_F77(gfortran)  AC_PROG_F77(gfortran)
   
 dnl Check for Fortran 9* compiler  dnl Check for Fortran 9* compiler
 AC_PROG_FC(gfortran)  AC_PROG_FC(gfortran)
   
 if test x"$F77" == x; then  if test x"$F77" = x; then
     AC_MSG_ERROR([Cannot find gfortran! You have to install it.])      AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi  fi
   
 if test x"$FC" == x; then  if test x"$FC" = x; then
     AC_MSG_ERROR([Cannot find gfortran! You have to install it.])      AC_MSG_ERROR([Cannot find gfortran! You have to install it.])
 fi  fi
   
 if test x"$FC" != x""; then  OPTIMISATION_C=-O3
     GCC_VERSION_MAJEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \  OPTIMISATION_CXX=-O3
             awk -F. '{ printf("%s", $1);}'`  OPTIMISATION_F=-O3
     GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \  
             awk -F. '{ printf("%s", $2);}'`  
     if test $GCC_VERSION_MAJEURE -ge 5; then  
         OPTIMISATION_F=-O3  
     else  
         if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then  
             OPTIMISATION_F=-O3  
         else  
             if test $GCC_VERSION_MAJEURE -ge 3; then  
                 OPTIMISATION_F=-O2  
             else  
                 AC_MSG_ERROR([Cannot find decent or recent gfortran (gfortran-4.3 or better)!])  
             fi  
         fi  
     fi  
 fi  
   
 dnl X paths  dnl X paths
 AC_PATH_X  AC_PATH_X
Line 141  fi Line 109  fi
 dnl 32 bits ABI  dnl 32 bits ABI
 AC_ARG_WITH(32bits-abi,  AC_ARG_WITH(32bits-abi,
 [  --with-32bits-abi       force 32bits ABI (multilib)],[  [  --with-32bits-abi       force 32bits ABI (multilib)],[
 if test "$with-32bits-abi" = "no"; then  if test "$with_32bits_abi" = "no"; then
     ABI=      ABI=
 else  else
     ABI=-m32      ABI=-m32
Line 153  fi],[ Line 121  fi],[
 if test x$ABI = x; then  if test x$ABI = x; then
 AC_ARG_WITH(64bits-abi,  AC_ARG_WITH(64bits-abi,
 [  --with-64bits-abi       force 64bits ABI (multilib)],[  [  --with-64bits-abi       force 64bits ABI (multilib)],[
 if test "$with-64bits-abi" = "no"; then  if test "$with_64bits_abi" = "no"; then
     ABI=      ABI=
 else  else
     ABI=-m64      ABI=-m64
Line 165  fi Line 133  fi
   
 LDFLAGS="$LDFLAGS $ABI"  LDFLAGS="$LDFLAGS $ABI"
   
   AC_ARG_WITH(sysroot,
   [  --with-sysroot          sysroot for cross compilation],[
   if test "$with_sysroot" = "no" -o "$with_rpltools" = "yes"; then
       AC_MSG_ERROR([You have to specify sysroot path !])
   else
       SYSROOT="-I$with_sysroot/usr/include"
       SYSROOT2=$with_sysroot
   fi],[
       SYSROOT=
       SYSROOT2=
       ]
   )
   
 AC_ARG_ENABLE(recursive,  AC_ARG_ENABLE(recursive,
 [  --enable-recursive      recursive configuration (default=yes)],[  [  --enable-recursive      recursive configuration (default=yes)],[
 if test "$enableval" = "yes"; then  if test "$enableval" = "yes"; then
Line 178  fi],[ Line 159  fi],[
   
 AC_ARG_WITH(rpltools,  AC_ARG_WITH(rpltools,
 [  --with-rpltools         specify rpltools path used for cross compilation],[  [  --with-rpltools         specify rpltools path used for cross compilation],[
 if test "$with_rpltools" = "no" -o "$with_rpltools" = yes; then  if test "$with_rpltools" = "no" -o "$with_rpltools" = "yes"; then
     AC_MSG_ERROR([You have to specify rpltools path !])      AC_MSG_ERROR([You have to specify rpltools path !])
 else  else
     RPLTOOLS=$with_rpltools      RPLTOOLS=$with_rpltools
Line 195  AC_ARG_ENABLE(rplcas, Line 176  AC_ARG_ENABLE(rplcas,
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     RPLCAS=-URPLCAS      RPLCAS=-URPLCAS
     LIBRPLCAS=      LIBRPLCAS=
       INCRPLCAS=
 else  else
     RPLCAS=-DRPLCAS      RPLCAS=-DRPLCAS
     LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a      LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a
       INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \
               -I\$(top_builddir)/rplcas/include"
 fi],[  fi],[
     RPLCAS=-URPLCAS      RPLCAS=-URPLCAS
     LIBRPLCAS=      LIBRPLCAS=
       INCRPLCAS=
     ]      ]
 )  )
   
 AC_SUBST(ABI)  AC_SUBST(ABI)
 AC_SUBST(RPLCAS)  AC_SUBST(RPLCAS)
 AC_SUBST(LIBRPLCAS)  AC_SUBST(LIBRPLCAS)
   AC_SUBST(INCRPLCAS)
   
 dnl Options  dnl Options
 AC_ARG_ENABLE(optimization,  AC_ARG_ENABLE(optimization,
Line 222  else Line 208  else
     CXXFLAGS="$CXXFLAGS $ABI $enable_optimization"      CXXFLAGS="$CXXFLAGS $ABI $enable_optimization"
     FCFLAGS="$FCFLAGS $ABI $enable_optimization"      FCFLAGS="$FCFLAGS $ABI $enable_optimization"
 fi],[  fi],[
     CFLAGS="$CFLAGS $ABI $OPTIMISATION_C"      CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" 
     FFLAGS="$FFLAGS $ABI $OPTIMISATION_F"      FFLAGS="$FFLAGS $ABI $OPTIMISATION_F"
     CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX"      CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX"
     FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F"      FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F"
     ]      ]
 )  )
   
   CFLAGS="$CFLAGS -fno-strict-overflow"
   
 AC_MSG_CHECKING([for usable shared memory])  AC_MSG_CHECKING([for usable shared memory])
 AC_COMPILE_IFELSE(  AC_COMPILE_IFELSE(
     [AC_LANG_PROGRAM([#include <sys/shm.h>      [AC_LANG_PROGRAM([#include <sys/shm.h>
Line 269  else Line 257  else
     IPCS_SYSV=-DIPCS_SYSV      IPCS_SYSV=-DIPCS_SYSV
     POSIX_IPCS=yes      POSIX_IPCS=yes
 fi],  fi],
 REG=$LDFLAGS  REG=$LIBS
 POSIX_IPCS=guessed  POSIX_IPCS=guessed
 LDFLAGS=-lrt  LIBS="-lrt -lpthread"
 [AC_MSG_CHECKING([for POSIX semaphores and shared objects])  [AC_MSG_CHECKING([for POSIX semaphores and shared objects])
 AC_RUN_IFELSE(  AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <sys/mman.h>  [AC_LANG_PROGRAM([#include <sys/mman.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <fcntl.h>  #include <fcntl.h>
Line 290  fd = shm_open(sem , O_CREAT | O_RDWR, S_ Line 278  fd = shm_open(sem , O_CREAT | O_RDWR, S_
 [IPCS_SYSV=-UIPCS_SYSV; AC_MSG_RESULT(yes)],  [IPCS_SYSV=-UIPCS_SYSV; AC_MSG_RESULT(yes)],
 [IPCS_SYSV=-DIPCS_SYSV; AC_MSG_RESULT(no)]  [IPCS_SYSV=-DIPCS_SYSV; AC_MSG_RESULT(no)]
     )]      )]
 LDFLAGS=$REG  LIBS=$REG
 )  )
   
 if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then  if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then
 REG=$LDFLAGS  REG=$LIBS
 LDFLAGS=-pthread  LIBS=-pthread
 AC_MSG_CHECKING([for POSIX anonymous semaphores])  AC_MSG_CHECKING([for POSIX anonymous semaphores])
 AC_RUN_IFELSE(  AC_LINK_IFELSE(
 [AC_LANG_PROGRAM([#include <semaphore.h>  [AC_LANG_PROGRAM([#include <semaphore.h>
  ],   ],
 [ sem_t sem;  [ sem_t sem;
Line 308  AC_RUN_IFELSE( Line 296  AC_RUN_IFELSE(
 [SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES; AC_MSG_RESULT(yes)],  [SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES; AC_MSG_RESULT(yes)],
 [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)]  [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)]
     )      )
 LDFLAGS=$REG  LDFLAGS=$LIBS
 REG=""  REG=""
 else  else
     SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES      SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
Line 397  if test "$enableval" = "no"; then Line 385  if test "$enableval" = "no"; then
 else  else
     MOTIF_SUPPORT="-DMOTIF_SUPPORT"      MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 fi],  fi],
 if test "$have_x" == "yes"; then  if test "$have_x" = "yes"; then
     MOTIF_SUPPORT="-DMOTIF_SUPPORT"      MOTIF_SUPPORT="-DMOTIF_SUPPORT"
 else  else
     MOTIF_SUPPORT="-UMOTIF_SUPPORT"      MOTIF_SUPPORT="-UMOTIF_SUPPORT"
Line 445  fi], [PROFILAGE=""]) Line 433  fi], [PROFILAGE=""])
   
 AC_SUBST(PROFILAGE)  AC_SUBST(PROFILAGE)
   
   dnl Checks for uuencode
   AC_CHECK_PROG(UUENCODE, uuencode, yes, no)
   if test "$UUENCODE" = no; then
       AC_MSG_ERROR([Can not find uuencode !])
   fi
   
 if test ! -d tools; then  if test ! -d tools; then
     mkdir tools      mkdir tools
 fi  fi
Line 456  if test ! -d "$srcdir"/tools/$NCURSES; t Line 450  if test ! -d "$srcdir"/tools/$NCURSES; t
             do TMP=$i; gunzip -c $i > ${TMP%.*};              do TMP=$i; gunzip -c $i > ${TMP%.*};
             done;              done;
             for i in ../$NCURSES*.sh;              for i in ../$NCURSES*.sh;
             do chmod 775 $i && ./$i;              do echo Applying script $i && chmod 775 $i && ./$i;
             done;              done;
             for i in ../$NCURSES*.patch.gz;              for i in ../$NCURSES*.patch.gz;
             do gunzip -c $i | patch -p1;              do echo Applying patch $i && \
                       if test $i = "../ncurses-5.9-20140607.patch.gz" ; then \
                           rm -f Ada95/src/library.gpr; \
                       fi && \
                   gunzip -c $i | patch -p1;
             done);              done);
 fi  fi
 if test ! -d "$srcdir"/tools/$READLINE; then  if test ! -d "$srcdir"/tools/$READLINE; then
Line 487  fi Line 485  fi
 if test ! -d "$srcdir"/tools/$FILE; then  if test ! -d "$srcdir"/tools/$FILE; then
     gunzip -c "$srcdir"/tools/$FILE.tar.gz | \      gunzip -c "$srcdir"/tools/$FILE.tar.gz | \
             (cd "$srcdir/tools" && tar -xf - )              (cd "$srcdir/tools" && tar -xf - )
     (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1)      (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1 && \
 fi              autoreconf)
 if test ! -d "$srcdir"/tools/$ICONV; then  
     gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \  
             (cd "$srcdir/tools" && tar -xf -)  
 fi  fi
 if test ! -d "$srcdir"/tools/$SQLITE; then  if test ! -d "$srcdir"/tools/$SQLITE; then
     gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \      gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \
Line 500  fi Line 495  fi
 if test ! -d "$srcdir"/tools/$SIGSEGV; then  if test ! -d "$srcdir"/tools/$SIGSEGV; then
     gunzip -c "$srcdir"/tools/$SIGSEGV.tar.gz | \      gunzip -c "$srcdir"/tools/$SIGSEGV.tar.gz | \
             (cd "$srcdir/tools" && tar -xf -)              (cd "$srcdir/tools" && tar -xf -)
       (cd "$srcdir/tools/$SIGSEGV" && ./autogen.sh --skip-gnulib)
   fi
   if test ! -d "$srcdir"/tools/$ICONV; then
       gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
               (cd "$srcdir/tools" && tar -xf -)
       (cd "$srcdir"/tools/$ICONV && ln -sf ../$SIGSEGV/gnulib gnulib)
 fi  fi
 if test ! -d "$srcdir"/tools/$OPENMOTIF; then  if test ! -d "$srcdir"/tools/$OPENMOTIF; then
     gunzip -c "$srcdir"/tools/$OPENMOTIF.tar.gz | \      gunzip -c "$srcdir"/tools/$OPENMOTIF.tar.gz | \
Line 513  if test ! -d tools/$OPENSSL; then Line 514  if test ! -d tools/$OPENSSL; then
     gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \      gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
             (cd tools && tar -xf -)              (cd tools && tar -xf -)
 fi  fi
   if test ! -d tools/$ZLIB; then
       gunzip -c "$srcdir"/tools/$ZLIB.tar.gz | \
               (cd tools && tar -xf - && cd $ZLIB && ./configure --static)
   fi
 if test ! -d rplcas; then  if test ! -d rplcas; then
     mkdir rplcas      mkdir rplcas
 fi  fi
Line 581  if test "$SED" = no; then Line 586  if test "$SED" = no; then
     AC_MSG_ERROR([Can not find sed !])      AC_MSG_ERROR([Can not find sed !])
 fi  fi
   
   dnl Checks for yacc
   AC_CHECK_PROG(YACC, yacc, yes, no)
   if test "$YACC" = no; then
       AC_MSG_ERROR([Can not find yacc !])
   fi
   
 dnl Checks for TeX, LaTeX, dvips, gs, gv, vim and gnuplot  dnl Checks for TeX, LaTeX, dvips, gs, gv, vim and gnuplot
 if test "$TEX_SUPPORT" = guessed; then  if test "$TEX_SUPPORT" = guessed; then
     POSTSCRIPT_SUPPORT="-DPOSTSCRIPT_SUPPORT"      POSTSCRIPT_SUPPORT="-DPOSTSCRIPT_SUPPORT"
Line 714  dnl Do we need to use -lrt? Line 725  dnl Do we need to use -lrt?
 AC_CHECK_LIB(rt, nanosleep, LIBS="$LIBS -lrt",  AC_CHECK_LIB(rt, nanosleep, LIBS="$LIBS -lrt",
         AC_MSG_WARN([librt doesn't seem to be needed on this system.]))          AC_MSG_WARN([librt doesn't seem to be needed on this system.]))
   
   AC_CHECK_LIB(rt, shm_open, LIBS="$LIBS -lrt",
           AC_MSG_WARN([librt doesn't seem to be needed on this system.]))
   
   AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread",
           AC_MSG_WARN([libpthread doesn't seem to be needed on this system.]))
   
 dnl Do we need to use -lsocket?  dnl Do we need to use -lsocket?
 AC_CHECK_LIB(socket, bind, LIBS="$LIBS -lsocket",  AC_CHECK_LIB(socket, bind, LIBS="$LIBS -lsocket",
         AC_MSG_WARN([libsocket doesn't seem to be needed on this system.]))          AC_MSG_WARN([libsocket doesn't seem to be needed on this system.]))
Line 795  fi Line 812  fi
 if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPPORT"; then  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPPORT"; then
     MYSQL_LIB=no      MYSQL_LIB=no
   
   
     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"
         if test $STATIC = no; then          if test $STATIC = no; then
             LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"              LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc"
         else          else
             LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc"              LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a $libMySQLinc"
         fi          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;
Line 1068  AC_ARG_WITH(openssl_arch, Line 1084  AC_ARG_WITH(openssl_arch,
 if test $(uname) = "OS/2"; then  if test $(uname) = "OS/2"; then
     bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd"      bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd"
 else  else
       if test $build = $host; then
           OPENSSL_CROSS=
       else
           OPENSSL_CROSS="AR=$host-ar RANLIB=$host-ranlib CC=$host-gcc NM=$host-nm"
       fi
       echo $build $host
       echo $OPENSSL_CROSS
     if test "x$with_openssl_arch" = xnone; then      if test "x$with_openssl_arch" = xnone; then
         (cd tools/$OPENSSL && ./config no-asm)          (cd tools/$OPENSSL && sh -c "$OPENSSL_CROSS ./config no-asm")
     elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then      elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then
         (cd tools/$OPENSSL && ./Configure)          (cd tools/$OPENSSL && ./Configure)
         AC_MSG_ERROR([OS/COMP informations are required!])          AC_MSG_ERROR([OS/COMP informations are required!])
Line 1077  else Line 1100  else
         (cd tools/$OPENSSL && ./Configure)          (cd tools/$OPENSSL && ./Configure)
         AC_MSG_ERROR([Please specify OS and Architecture])          AC_MSG_ERROR([Please specify OS and Architecture])
     else      else
         (cd tools/$OPENSSL && ./Configure no-asm $with_openssl_arch)          (cd tools/$OPENSSL && sh -c "$OPENSSL_CROSS ./Configure no-asm \
                   $with_openssl_arch")
     fi      fi
 fi  fi
   
Line 1100  AC_SUBST(GNUPLOT_COMPILATION) Line 1124  AC_SUBST(GNUPLOT_COMPILATION)
   
 HOST=$target  HOST=$target
 AC_SUBST(HOST)  AC_SUBST(HOST)
   BUILD=$build
   AC_SUBST(BUILD)
   
 my_save_cflags="$CFLAGS"  my_save_cflags="$CFLAGS"
 FPCFLAGS=""  FPCFLAGS=""
Line 1144  esac Line 1170  esac
   
 AC_SUBST(OS)  AC_SUBST(OS)
   
 DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')  
 DATE=$(env LC_ALL=C date +'%A %x, %X %Z')  DATE=$(env LC_ALL=C date +'%A %x, %X %Z')
 MALLOC=  MALLOC=
   
Line 1201  case $OS in Line 1226  case $OS in
     OS/2)      OS/2)
         if test $FORCED_FINAL_ENCODING -eq 0; then \          if test $FORCED_FINAL_ENCODING -eq 0; then \
             FINAL_ENCODING=CP850; \              FINAL_ENCODING=CP850; \
               FORCED_FINAL_ENCODING=1;\
         fi;          fi;
         OS=OS2          OS=OS2
         NESTED_FUNCTIONS=          NESTED_FUNCTIONS=
Line 1218  case $OS in Line 1244  case $OS in
     OpenBSD)      OpenBSD)
         if test $FORCED_FINAL_ENCODING -eq 0; then \          if test $FORCED_FINAL_ENCODING -eq 0; then \
             FINAL_ENCODING=UTF-8; \              FINAL_ENCODING=UTF-8; \
               FORCED_FINAL_ENCODING=1;\
         fi;          fi;
         EXPORT_DYNAMIC=-Wl,--export-dynamic          EXPORT_DYNAMIC=-Wl,--export-dynamic
         NESTED_FUNCTIONS=          NESTED_FUNCTIONS=
Line 1288  case $OS in Line 1315  case $OS in
 esac  esac
   
 case $HOST in  case $HOST in
     x86_64-unknown-linux-gnu)      x86_64-*-linux-gnu)
         ARCH=amd64          ARCH=amd64
     break ;;      break ;;
   
     i?86-unknown-linux-gnu)      i?86-*-linux-gnu)
         ARCH=i386          ARCH=i386
     break ;;      break ;;
   
       arm-unknown-linux-gnueabi)
           ARCH=armel
       break;;
   
       mips*el-unknown-linux-gnu)
           ARCH=mipsel
       break;;
   
     *)      *)
         ARCH=unknown          ARCH=$(echo $HOST | cut -f1 -d-)
     break ;;      break ;;
 esac  esac
   
Line 1331  AC_SUBST(OPENMOTIF) Line 1366  AC_SUBST(OPENMOTIF)
 AC_SUBST(BUILD_OPENMOTIF)  AC_SUBST(BUILD_OPENMOTIF)
 AC_SUBST(SIGSEGV)  AC_SUBST(SIGSEGV)
 AC_SUBST(FINAL_ENCODING)  AC_SUBST(FINAL_ENCODING)
   AC_SUBST(FORCED_FINAL_ENCODING)
 AC_SUBST(DATE)  AC_SUBST(DATE)
 AC_SUBST(DATE_FR)  
 AC_SUBST(EXT_SQL)  AC_SUBST(EXT_SQL)
 AC_SUBST(MALLOC)  AC_SUBST(MALLOC)
 AC_SUBST(GMP)  AC_SUBST(GMP)
Line 1343  AC_SUBST(PARI) Line 1378  AC_SUBST(PARI)
 AC_SUBST(GIAC)  AC_SUBST(GIAC)
 AC_SUBST(INCMOTIF)  AC_SUBST(INCMOTIF)
 AC_SUBST(LIBMOTIF)  AC_SUBST(LIBMOTIF)
   AC_SUBST(ZLIB)
   
 AC_SUBST(CFLAGS)  AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)  AC_SUBST(CXXFLAGS)
 AC_SUBST(FFLAGS)  AC_SUBST(FFLAGS)
 AC_SUBST(FCFLAGS)  AC_SUBST(FCFLAGS)
 AC_SUBST(LDFLAGS)  AC_SUBST(LDFLAGS)
   AC_SUBST(SYSROOT)
   AC_SUBST(SYSROOT2)
   
 AC_SUBST(DEBPQ)  AC_SUBST(DEBPQ)
 AC_SUBST(DEBMYSQL)  AC_SUBST(DEBMYSQL)
Line 1367  if test $RECURSIVE = yes; then Line 1405  if test $RECURSIVE = yes; then
 fi  fi
   
 AC_CONFIG_FILES(Makefile)  AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(COPYING)  AC_CONFIG_FILES(HEADER)
 AC_CONFIG_FILES(tools/Makefile)  AC_CONFIG_FILES(tools/Makefile)
 AC_CONFIG_FILES(src/Makefile)  AC_CONFIG_FILES(src/Makefile)
 AC_CONFIG_FILES(man/Makefile)  AC_CONFIG_FILES(man/Makefile)
Removed from v.1.22  
changed lines
  Added in v.1.100

CVSweb interface <joel.bertrand@systella.fr>