Diff for /rpl/configure.ac between versions 1.18 and 1.24

version 1.18, 2012/01/18 11:03:45 version 1.24, 2012/04/08 18:03:09
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.6])  AC_INIT([rpl],[4.1.7])
 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.10  SQLITE=sqlite-3.7.11
 OPENSSL=openssl-1.0.0f  OPENSSL=openssl-1.0.1
 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
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"
   fi],[
       SYSROOT=
       ]
   )
   
 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 189  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 284  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 308  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 404  else Line 415  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 456  if test ! -d "$srcdir"/tools/$NCURSES; t Line 467  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 && 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 498  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 795  fi Line 807  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"
Line 1068  AC_ARG_WITH(openssl_arch, Line 1079  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 1095  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 1296  case $HOST in Line 1315  case $HOST in
         ARCH=i386          ARCH=i386
     break ;;      break ;;
   
       arm-unknown-linux-gnueabi)
           ARCH=armel
       break;;
   
     *)      *)
         ARCH=unknown          ARCH=unknown
     break ;;      break ;;
Line 1349  AC_SUBST(CXXFLAGS) Line 1372  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(DEBPQ)  AC_SUBST(DEBPQ)
 AC_SUBST(DEBMYSQL)  AC_SUBST(DEBMYSQL)
Line 1366  if test $RECURSIVE = yes; then Line 1390  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)

Removed from v.1.18  
changed lines
  Added in v.1.24


CVSweb interface <joel.bertrand@systella.fr>