--- rpl/configure.ac 2011/10/10 10:58:10 1.6 +++ rpl/configure.ac 2011/12/05 09:19:14 1.12 @@ -1,8 +1,9 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.4]) +AC_INIT([rpl],[4.1.5]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(silent-rules) +AM_SILENT_RULES([yes]) AC_SUBST(target_cpu) AC_CONFIG_HEADERS([rplconfig.h]) @@ -15,7 +16,7 @@ GPP=gpp-3.0 GNUPLOT=gnuplot-4.4.3 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.8 +SQLITE=sqlite-3.7.9 OPENSSL=openssl-1.0.0e OPENMOTIF=openmotif-2.3.3 LIBXPM=libXpm-3.5.9 @@ -26,7 +27,7 @@ MPFR=mpfr-3.0.1 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9943 PARI=pari-2.5.0 -GIAC=giac-0.9.3 +GIAC=giac-0.9.5 dnl Checks for C compiler AC_PROG_CC(gcc) @@ -239,7 +240,7 @@ AC_COMPILE_IFELSE( AC_SUBST(SHARED_MEMORY) AC_MSG_CHECKING([for pselect]) -AC_RUN_IFELSE( +AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([#include #include #include @@ -406,7 +407,7 @@ if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP \$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a" INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \ -I\$(top_builddir)/tools/$OPENMOTIF/lib \ - -I\$(top_builddir)/tools/$LIBXPM/include" + -I\$(top_srcdir)/tools/$LIBXPM/include" BUILD_OPENMOTIF="$LIBXPM $OPENMOTIF" if test $RECURSIVE = yes; then @@ -1265,6 +1266,20 @@ case $OS in break ;; esac +case $HOST in + x86_64-unknown-linux-gnu) + ARCH=amd64 + break ;; + + i?86-unknown-linux-gnu) + ARCH=i386 + break ;; + + *) + ARCH=unknown + break ;; +esac + AC_SUBST(WHOLE_LIB1) AC_SUBST(WHOLE_LIB2) AC_SUBST(LIB_PREFIX) @@ -1278,6 +1293,7 @@ AC_SUBST(SEMUN) AC_SUBST(IPV6) AC_SUBST(BSH_PATH) AC_SUBST(ELF) +AC_SUBST(ARCH) AC_SUBST(NCURSES) AC_SUBST(READLINE) @@ -1355,4 +1371,6 @@ AC_CONFIG_FILES(man/fr_FR/rpllink.1) AC_CONFIG_FILES(man/fr_FR/rpltags.1) AC_CONFIG_FILES(man/fr_FR/mkrplso.1) +AC_CONFIG_FILES(DEBIAN/control) + AC_OUTPUT