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

Diff for /rpl/configure.ac between versions 1.205 and 1.233

version 1.205, 2018/01/01 10:34:06 version 1.233, 2019/02/04 09:21:45
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.28])  AC_INIT([rpl],[4.1.31])
 AC_CANONICAL_TARGET  
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)  AM_INIT_AUTOMAKE(silent-rules)
 AM_SILENT_RULES([yes])  AM_SILENT_RULES([yes])
Line 10  AC_CONFIG_HEADERS([rplconfig.h]) Line 9  AC_CONFIG_HEADERS([rplconfig.h])
 dnl Libraries  dnl Libraries
 NCURSES=ncurses-6.0  NCURSES=ncurses-6.0
 READLINE=readline-7.0  READLINE=readline-7.0
 UNITS=units-2.14  UNITS=units-2.16
 GSL=gsl-2.4  GSL=gsl-2.5
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-5.0.6  GNUPLOT=gnuplot-5.2.5
 FILE=file-5.31  FILE=file-5.33
 ICONV=libiconv-1.15  ICONV=libiconv-1.15
 SQLITE=sqlite-3.19.3  SQLITE=sqlite-3.26.0
 OPENSSL=openssl-1.1.0g  OPENSSL=openssl-1.1.1a
 OPENMOTIF=openmotif-2.3.7  OPENMOTIF=motif-2.3.8
 LIBXPM=libXpm-3.5.12  LIBXPM=libXpm-3.5.12
 SIGSEGV=libsigsegv-2.11  SIGSEGV=libsigsegv-2.12
 ZLIB=zlib-1.2.8  ZLIB=zlib-1.2.11
   
 GMP=gmp-6.1.2  GMP=gmp-6.1.2
 MPFR=mpfr-3.1.5  MPFR=mpfr-4.0.1
 MPFI=mpfi-1.5.1  MPFI=mpfi-1.5.3
 NTL=ntl-9.11.0  NTL=ntl-11.0.0
 COCOA=CoCoALib-0.99542  COCOA=CoCoALib-0.99600
 PARI=pari-2.7.6  PARI=pari-2.9.5
 GIAC=giac-1.2.2  GIAC=giac-1.4.9
   
 dnl 32 bits ABI  dnl 32 bits ABI
 AC_ARG_WITH(gcc_version,  AC_ARG_WITH(gcc_version,
Line 95  dnl X paths Line 94  dnl X paths
 AC_PATH_X  AC_PATH_X
 AC_PATH_XTRA  AC_PATH_XTRA
   
 if test "$ac_x_includes" != "no"; then  
     if test x"$ac_x_includes" != x; then  
         X_CFLAGS="$X_CFLAGS -I$ac_x_includes"  
         includeX="-I$ac_x_includes"  
     fi  
 fi  
 if test "$ac_x_libraries" != "no"; then  
     if test x"$ac_x_libraries" != x; then  
         X_LIBS="$X_LIBS -L$ac_x_libraries"  
     fi  
 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)],[
Line 185  fi],[ Line 172  fi],[
   
 AC_SUBST(RPLTOOLS)  AC_SUBST(RPLTOOLS)
   
   dnl libcurl path
   AC_ARG_WITH(curl,
   [  --with-curl             specify libcurl path used for RPL/CAS],[
   if test "$with_curl" = "no" -o "$with_curl" = "yes"; then
       AC_MSG_ERROR([You have to specify libcurl path !])
   else
       LIBCURL=-L$with_curl
   fi],[
       LIBCURL=
       ]
   )
   
 dnl RPL/CAS support  dnl RPL/CAS support
 AC_ARG_ENABLE(rplcas,  AC_ARG_ENABLE(rplcas,
 [  --enable-rplcas         compile rplcas (default=no)],[  [  --enable-rplcas         compile rplcas (default=no)],[
Line 194  if test "$enableval" = "no"; then Line 193  if test "$enableval" = "no"; then
     INCRPLCAS=      INCRPLCAS=
 else  else
     RPLCAS=-DRPLCAS      RPLCAS=-DRPLCAS
     LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a      LIBRPLCAS="\$(top_builddir)/rplcas/lib/librplcas.a"
   dnl LIBS="$LIBS $LIBCURL -lcurl"
       LIBGIAC="$LIBCURL -lcurl"
     INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \      INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \
             -I\$(top_builddir)/rplcas/include"              -I\$(top_builddir)/rplcas/include"
 fi],[  fi],[
Line 208  AC_SUBST(ABI) Line 209  AC_SUBST(ABI)
 AC_SUBST(RPLCAS)  AC_SUBST(RPLCAS)
 AC_SUBST(LIBRPLCAS)  AC_SUBST(LIBRPLCAS)
 AC_SUBST(INCRPLCAS)  AC_SUBST(INCRPLCAS)
   AC_SUBST(LIBGIAC)
   
 dnl Options  dnl Options
 AC_ARG_ENABLE(optimization,  AC_ARG_ENABLE(optimization,
Line 298  AC_LINK_IFELSE( Line 300  AC_LINK_IFELSE(
 [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)]  [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)]
     )      )
 LDFLAGS=$LIBS  LDFLAGS=$LIBS
 REG=""  LIBS=$REG
 else  else
     SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES      SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES
 fi  fi
Line 380  INCMOTIF="" Line 382  INCMOTIF=""
 BUILD_OPENMOTIF=""  BUILD_OPENMOTIF=""
 MODULE_MOTIF=""  MODULE_MOTIF=""
   
   
   if test "$ac_x_includes" != "no"; then
       if test x"$ac_x_includes" != x; then
           includeX="-I$ac_x_includes"
       fi
   fi
   if test "$ac_x_libraries" != "no"; then
       if test x"$ac_x_libraries" != x; then
           X_LIBS="-L$ac_x_libraries"
       fi
   fi
   
 AC_ARG_ENABLE(motif,  AC_ARG_ENABLE(motif,
 [  --enable-motif          provide the Motif support [[default=guessed]]], [  [  --enable-motif          provide the Motif support [[default=guessed]]], [
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
Line 393  else Line 407  else
     MOTIF_SUPPORT="-UMOTIF_SUPPORT"      MOTIF_SUPPORT="-UMOTIF_SUPPORT"
 fi)  fi)
   
   dnl libXinerama path
   AC_ARG_WITH(xinerama,
   [  --with-xinerama         specify libxinerama path used for Motif],[
   if test "$with_xinerama" = "no" -o "$with_xinerama" = "yes"; then
       AC_MSG_ERROR([You have to specify libxinerama path !])
   else
       LIBXINERAMA=-L$with_xinerama
   fi],[
       LIBXINERAMA=
       ]
   )
   
 if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then  if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
     libX="$X_LIBS -lXt -lX11 -lXext -lXinerama"      libX="$X_LIBS -lXt -lX11 -lXext $LIBXINERAMA -lXinerama"
     LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/install/lib/libXm.a \      LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/install/lib/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 465  if test ! -d "$srcdir"/tools/$NCURSES; t Line 491  if test ! -d "$srcdir"/tools/$NCURSES; t
             for i in $(ls ../$NCURSES*.patch.gz);              for i in $(ls ../$NCURSES*.patch.gz);
             do echo Applying patch $i && \              do echo Applying patch $i && \
                 gunzip -c $i | patch -p1;                  gunzip -c $i | patch -p1;
               done;
               for i in $(ls ../ncurses-6.1*.patch.gz);
               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 717  AC_CHECK_LIB(c, pthread_mutex_init,, Line 747  AC_CHECK_LIB(c, pthread_mutex_init,,
              [AC_CHECK_LIB(pthread, main,,               [AC_CHECK_LIB(pthread, main,,
              AC_MSG_ERROR([Can not find libpthread !]))])               AC_MSG_ERROR([Can not find libpthread !]))])
 if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then  if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
       REG=$LIBS
       LIBS="$LIBS $libX"
     AC_CHECK_LIB(Xinerama, XineramaIsActive,,      AC_CHECK_LIB(Xinerama, XineramaIsActive,,
                  AC_MSG_ERROR([Can not find libXinerama !]))                   AC_MSG_ERROR([Can not find libXinerama !]))
       LIBS=$REG
 fi  fi
 AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !]))  AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !]))
 OPENMP=-lgomp  OPENMP=-lgomp
Line 1155  AC_MSG_CHECKING([whether CC supports -ma Line 1188  AC_MSG_CHECKING([whether CC supports -ma
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
     [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -malign-double"],      [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -malign-double"],
     [AC_MSG_RESULT([no])])      [AC_MSG_RESULT([no])])
 CFLAGS=-mieee-fp  #CFLAGS=-mieee-fp
 AC_MSG_CHECKING([whether CC supports -mieee-fp])  #AC_MSG_CHECKING([whether CC supports -mieee-fp])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],  #AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
     [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee-fp"],  #    [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee-fp"],
     [AC_MSG_RESULT([no])])  #   [AC_MSG_RESULT([no])])
 CFLAGS=-mieee  CFLAGS=-mieee
 AC_MSG_CHECKING([whether CC supports -mieee])  AC_MSG_CHECKING([whether CC supports -mieee])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
Removed from v.1.205  
changed lines
  Added in v.1.233

CVSweb interface <joel.bertrand@systella.fr>