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

Diff for /rpl/configure.ac between versions 1.11 and 1.29

version 1.11, 2011/11/26 10:01:23 version 1.29, 2012/05/14 19:30:02
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.5])  AC_INIT([rpl],[4.1.8])
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)  AM_INIT_AUTOMAKE(silent-rules)
Line 13  READLINE=readline-6.2 Line 13  READLINE=readline-6.2
 UNITS=units-1.88  UNITS=units-1.88
 GSL=gsl-1.15  GSL=gsl-1.15
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-4.4.3  GNUPLOT=gnuplot-4.6.0
 FILE=file-5.03  FILE=file-5.11
 ICONV=libiconv-1.13.1  ICONV=libiconv-1.13.1
 SQLITE=sqlite-3.7.9  SQLITE=sqlite-3.7.11
 OPENSSL=openssl-1.0.0e  OPENSSL=openssl-1.0.1c
 OPENMOTIF=openmotif-2.3.3  OPENMOTIF=openmotif-2.3.3
 LIBXPM=libXpm-3.5.9  LIBXPM=libXpm-3.5.9
 SIGSEGV=libsigsegv-2.6  SIGSEGV=libsigsegv-2.6
   
 GMP=gmp-5.0.2  GMP=gmp-5.0.5
 MPFR=mpfr-3.0.1  MPFR=mpfr-3.1.0
 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.1
 GIAC=giac-0.9.5  GIAC=giac-0.9.6
   
 dnl Checks for C compiler  dnl Checks for C compiler
 AC_PROG_CC(gcc)  AC_PROG_CC(gcc)
Line 141  fi Line 141  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 153  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 165  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 191  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 273  REG=$LDFLAGS Line 286  REG=$LDFLAGS
 POSIX_IPCS=guessed  POSIX_IPCS=guessed
 LDFLAGS=-lrt  LDFLAGS=-lrt
 [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 297  if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a Line 310  if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a
 REG=$LDFLAGS  REG=$LDFLAGS
 LDFLAGS=-pthread  LDFLAGS=-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 350  AC_ARG_ENABLE(vim, Line 363  AC_ARG_ENABLE(vim,
 [  --enable-vim            provide the vim support [[default=guessed]]], [  [  --enable-vim            provide the vim support [[default=guessed]]], [
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     VIM_SUPPORT=no      VIM_SUPPORT=no
       DEBVIM=
 else  else
     VIM_SUPPORT=yes      VIM_SUPPORT=yes
       DEBVIM=", vim"
 fi],  fi],
 VIM_SUPPORT=guessed)  VIM_SUPPORT=guessed)
   
Line 402  else Line 417  else
 fi)  fi)
   
 if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then  if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
     libX="$X_LIBS -lXt -lX11"      libX="$X_LIBS -lXt -lX11 -lXext"
     LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/lib/Xm/.libs/libXm.a \      LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/lib/Xm/.libs/libXm.a \
             \$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a"              \$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a"
     INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \      INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \
Line 450  if test ! -d "$srcdir"/tools/$NCURSES; t Line 465  if test ! -d "$srcdir"/tools/$NCURSES; t
     gunzip -c "$srcdir"/tools/$NCURSES.tar.gz | \      gunzip -c "$srcdir"/tools/$NCURSES.tar.gz | \
             (cd "$srcdir/tools" && tar -xf -)              (cd "$srcdir/tools" && tar -xf -)
     (cd "$srcdir/tools/"$NCURSES && \      (cd "$srcdir/tools/"$NCURSES && \
               for i in ../$NCURSES*.sh.gz;
               do TMP=$i; gunzip -c $i > ${TMP%.*};
               done;
               for i in ../$NCURSES*.sh;
               do echo Applying script $i && chmod 775 $i && ./$i;
               done;
             for i in ../$NCURSES*.patch.gz;              for i in ../$NCURSES*.patch.gz;
             do gunzip -c $i | patch -p1;              do echo Applying patch $i && gunzip -c $i | patch -p1;
             done);              done);
 fi  fi
 if test ! -d "$srcdir"/tools/$READLINE; then  if test ! -d "$srcdir"/tools/$READLINE; then
Line 479  fi Line 500  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 && \
               autoreconf)
 fi  fi
 if test ! -d "$srcdir"/tools/$ICONV; then  if test ! -d "$srcdir"/tools/$ICONV; then
     gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \      gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
Line 649  if test "$VIM_SUPPORT" = guessed; then Line 671  if test "$VIM_SUPPORT" = guessed; then
 Download at http://www.vim.org/  Download at http://www.vim.org/
 ])  ])
         VIM_SUPPORT="-UVIM_SUPPORT"          VIM_SUPPORT="-UVIM_SUPPORT"
           DEBVIM=
     else      else
         VIM_SUPPORT="-DVIM_SUPPORT"          VIM_SUPPORT="-DVIM_SUPPORT"
           DEBVIM=", vim"
     fi      fi
 else  else
     if test "$VIM_SUPPORT" = no; then      if test "$VIM_SUPPORT" = no; then
         VIM_SUPPORT="-UVIM_SUPPORT"          VIM_SUPPORT="-UVIM_SUPPORT"
           DEBVIM=
     else      else
         VIM_SUPPORT="-DVIM_SUPPORT"          VIM_SUPPORT="-DVIM_SUPPORT"
           DEBVIM=", vim"
     fi      fi
 fi  fi
   
Line 806  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP Line 832  if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
     fi      fi
 fi  fi
   
   DEBMYSQL=
   
 if test "$MYSQL_SUPPORT" != "-DMYSQL_SUPPORT"; then  if test "$MYSQL_SUPPORT" != "-DMYSQL_SUPPORT"; then
     libMySQLinc=      libMySQLinc=
     libMySQLlib=      libMySQLlib=
   else
       DEBMYSQL=", libmysqlclient18"
 fi  fi
   
 AC_SUBST(MYSQL_SUPPORT)  AC_SUBST(MYSQL_SUPPORT)
Line 952  if test "$POSTGRESQL_SUPPORT" = "-DPOSTG Line 982  if test "$POSTGRESQL_SUPPORT" = "-DPOSTG
     fi      fi
 fi  fi
   
   DEBPQ=
   
 if test "$POSTGRESQL_SUPPORT" != "-DPOSTGRESQL_SUPPORT"; then  if test "$POSTGRESQL_SUPPORT" != "-DPOSTGRESQL_SUPPORT"; then
     libPgSQLinc=      libPgSQLinc=
     libPgSQLlib=      libPgSQLlib=
   else
       DEBPQ=", libpq5"
 fi  fi
   
 AC_SUBST(POSTGRESQL_SUPPORT)  AC_SUBST(POSTGRESQL_SUPPORT)
Line 1047  AC_ARG_WITH(openssl_arch, Line 1081  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 1056  else Line 1097  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 1079  AC_SUBST(GNUPLOT_COMPILATION) Line 1121  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 1266  case $OS in Line 1310  case $OS in
     break ;;      break ;;
 esac  esac
   
   case $HOST in
       x86_64-unknown-linux-gnu)
           ARCH=amd64
       break ;;
   
       i?86-unknown-linux-gnu)
           ARCH=i386
       break ;;
   
       arm-unknown-linux-gnueabi)
           ARCH=armel
       break;;
   
       *)
           ARCH=unknown
       break ;;
   esac
   
 AC_SUBST(WHOLE_LIB1)  AC_SUBST(WHOLE_LIB1)
 AC_SUBST(WHOLE_LIB2)  AC_SUBST(WHOLE_LIB2)
 AC_SUBST(LIB_PREFIX)  AC_SUBST(LIB_PREFIX)
Line 1279  AC_SUBST(SEMUN) Line 1341  AC_SUBST(SEMUN)
 AC_SUBST(IPV6)  AC_SUBST(IPV6)
 AC_SUBST(BSH_PATH)  AC_SUBST(BSH_PATH)
 AC_SUBST(ELF)  AC_SUBST(ELF)
   AC_SUBST(ARCH)
   
 AC_SUBST(NCURSES)  AC_SUBST(NCURSES)
 AC_SUBST(READLINE)  AC_SUBST(READLINE)
Line 1313  AC_SUBST(CXXFLAGS) Line 1376  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(DEBMYSQL)
   AC_SUBST(DEBVIM)
   
 if test $RECURSIVE = yes; then  if test $RECURSIVE = yes; then
     AC_CONFIG_SUBDIRS(tools/$NCURSES)      AC_CONFIG_SUBDIRS(tools/$NCURSES)
Line 1326  if test $RECURSIVE = yes; then Line 1395  if test $RECURSIVE = yes; then
     AC_CONFIG_SUBDIRS(tools/$SIGSEGV)      AC_CONFIG_SUBDIRS(tools/$SIGSEGV)
 fi  fi
   
   if test $MYSQL_LIB = "yes" -o $POSTGRESQL_LIB = "yes"; then
       ZLIB=-lz
   else
       ZLIB=
   fi
   
   AC_SUBST(ZLIB)
   
 AC_CONFIG_FILES(Makefile)  AC_CONFIG_FILES(Makefile)
 AC_CONFIG_FILES(COPYING)  AC_CONFIG_FILES(COPYING)
 AC_CONFIG_FILES(tools/Makefile)  AC_CONFIG_FILES(tools/Makefile)
Line 1356  AC_CONFIG_FILES(man/fr_FR/rpllink.1) Line 1433  AC_CONFIG_FILES(man/fr_FR/rpllink.1)
 AC_CONFIG_FILES(man/fr_FR/rpltags.1)  AC_CONFIG_FILES(man/fr_FR/rpltags.1)
 AC_CONFIG_FILES(man/fr_FR/mkrplso.1)  AC_CONFIG_FILES(man/fr_FR/mkrplso.1)
   
   AC_CONFIG_FILES(DEBIAN/control)
   
 AC_OUTPUT  AC_OUTPUT
Removed from v.1.11  
changed lines
  Added in v.1.29

CVSweb interface <joel.bertrand@systella.fr>