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

Diff for /rpl/configure.ac between versions 1.230 and 1.231

version 1.230, 2018/12/27 12:18:20 version 1.231, 2019/01/04 10:31:15
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.30])  AC_INIT([rpl],[4.1.30])
 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])
 AC_SUBST(target_cpu)  AC_SUBST(target_cpu)
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 195  if test "$enableval" = "no"; then Line 194  if test "$enableval" = "no"; then
 else  else
     RPLCAS=-DRPLCAS      RPLCAS=-DRPLCAS
     LIBRPLCAS="\$(top_builddir)/rplcas/lib/librplcas.a"      LIBRPLCAS="\$(top_builddir)/rplcas/lib/librplcas.a"
     LIBS+="-lcurl"      LIBS="$LIBS $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 381  INCMOTIF="" Line 380  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 394  else Line 405  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 722  AC_CHECK_LIB(c, pthread_mutex_init,, Line 745  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
Removed from v.1.230  
changed lines
  Added in v.1.231

CVSweb interface <joel.bertrand@systella.fr>