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

Diff for /rpl/configure.ac between versions 1.195 and 1.213

version 1.195, 2017/06/29 12:33:34 version 1.213, 2018/05/29 06:00:20
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.27])  AC_INIT([rpl],[4.1.28])
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(silent-rules)  AM_INIT_AUTOMAKE(silent-rules)
Line 10  AC_CONFIG_HEADERS([rplconfig.h]) Line 10  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.4
 GPP=gpp-3.0  GPP=gpp-3.0
 GNUPLOT=gnuplot-5.0.6  GNUPLOT=gnuplot-5.2.3
 FILE=file-5.31  FILE=file-5.33
 ICONV=libiconv-1.15  ICONV=libiconv-1.15
 SQLITE=sqlite-3.19.3  SQLITE=sqlite-3.23.1
 OPENSSL=openssl-1.1.0f  OPENSSL=openssl-1.1.0h
 OPENMOTIF=openmotif-2.3.7  OPENMOTIF=motif-2.3.8
 LIBXPM=libXpm-3.5.11  LIBXPM=libXpm-3.5.12
 SIGSEGV=libsigsegv-2.11  SIGSEGV=libsigsegv-2.11
 ZLIB=zlib-1.2.8  ZLIB=zlib-1.2.8
   
Line 378  libX="" Line 378  libX=""
 LIBMOTIF=""  LIBMOTIF=""
 INCMOTIF=""  INCMOTIF=""
 BUILD_OPENMOTIF=""  BUILD_OPENMOTIF=""
   MODULE_MOTIF=""
   
 AC_ARG_ENABLE(motif,  AC_ARG_ENABLE(motif,
 [  --enable-motif          provide the Motif support [[default=guessed]]], [  [  --enable-motif          provide the Motif support [[default=guessed]]], [
Line 393  else Line 394  else
 fi)  fi)
   
 if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then  if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then
     libX="$X_LIBS -lXt -lX11 -lXext"      libX="$X_LIBS -lXt -lX11 -lXext -lXinerama"
     LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/lib/Xm/.libs/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 \
             -I\$(top_builddir)/tools/$OPENMOTIF/lib \              -I\$(top_builddir)/tools/$OPENMOTIF/lib \
Line 405  if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP Line 406  if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP
         AC_CONFIG_SUBDIRS(tools/$LIBXPM)          AC_CONFIG_SUBDIRS(tools/$LIBXPM)
         AC_CONFIG_SUBDIRS(tools/$OPENMOTIF)          AC_CONFIG_SUBDIRS(tools/$OPENMOTIF)
     fi;      fi;
   
       MODULE_MOTIF="modules/motif"
 fi  fi
   
 AC_ARG_ENABLE(experimental,  AC_ARG_ENABLE(experimental,
Line 440  if test "$UUENCODE" = no; then Line 443  if test "$UUENCODE" = no; then
     AC_MSG_ERROR([Can not find uuencode !])      AC_MSG_ERROR([Can not find uuencode !])
 fi  fi
   
   dnl Checks for patch
   AC_CHECK_PROG(PATCH, patch, yes, no)
   if test "$PATCH" = no; then
       AC_MSG_ERROR([Can not find patch !])
   fi
   
 if test ! -d tools; then  if test ! -d tools; then
     mkdir tools      mkdir tools
 fi  fi
Line 707  AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can Line 716  AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can
 AC_CHECK_LIB(c, pthread_mutex_init,,  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
       AC_CHECK_LIB(Xinerama, XineramaIsActive,,
                    AC_MSG_ERROR([Can not find libXinerama !]))
   fi
   AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !]))
   OPENMP=-lgomp
   AC_SUBST(OPENMP)
   
 dnl Check for union semun  dnl Check for union semun
 AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[  AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[
Line 1413  AC_SUBST(PARI) Line 1429  AC_SUBST(PARI)
 AC_SUBST(GIAC)  AC_SUBST(GIAC)
 AC_SUBST(INCMOTIF)  AC_SUBST(INCMOTIF)
 AC_SUBST(LIBMOTIF)  AC_SUBST(LIBMOTIF)
   AC_SUBST(MODULE_MOTIF)
 AC_SUBST(ZLIB)  AC_SUBST(ZLIB)
 AC_SUBST(BUILD_SIGSEGV)  AC_SUBST(BUILD_SIGSEGV)
 AC_SUBST(BROKEN_SIGSEGV)  AC_SUBST(BROKEN_SIGSEGV)
Line 1461  AC_CONFIG_FILES(rplcas/Makefile) Line 1478  AC_CONFIG_FILES(rplcas/Makefile)
 AC_CONFIG_FILES(rplawk/Makefile)  AC_CONFIG_FILES(rplawk/Makefile)
 AC_CONFIG_FILES(lapack/lapack/Makefile)  AC_CONFIG_FILES(lapack/lapack/Makefile)
 AC_CONFIG_FILES(lapack/blas/Makefile)  AC_CONFIG_FILES(lapack/blas/Makefile)
   AC_CONFIG_FILES(modules/motif/Makefile)
 AC_CONFIG_FILES(modules/sets/Makefile)  AC_CONFIG_FILES(modules/sets/Makefile)
   
 AC_CONFIG_FILES(man/rpl.1)  AC_CONFIG_FILES(man/rpl.1)
Removed from v.1.195  
changed lines
  Added in v.1.213

CVSweb interface <joel.bertrand@systella.fr>