--- rpl/configure.ac 2011/11/17 19:29:36 1.9 +++ rpl/configure.ac 2012/01/18 10:57:40 1.17 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.4]) +AC_INIT([rpl],[4.1.6]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -16,8 +16,8 @@ GPP=gpp-3.0 GNUPLOT=gnuplot-4.4.3 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.8 -OPENSSL=openssl-1.0.0e +SQLITE=sqlite-3.7.10 +OPENSSL=openssl-1.0.0f OPENMOTIF=openmotif-2.3.3 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.6 @@ -27,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) @@ -350,8 +350,10 @@ AC_ARG_ENABLE(vim, [ --enable-vim provide the vim support [[default=guessed]]], [ if test "$enableval" = "no"; then VIM_SUPPORT=no + DEBVIM= else VIM_SUPPORT=yes + DEBVIM=", vim" fi], VIM_SUPPORT=guessed) @@ -450,6 +452,12 @@ if test ! -d "$srcdir"/tools/$NCURSES; t gunzip -c "$srcdir"/tools/$NCURSES.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) (cd "$srcdir/tools/"$NCURSES && \ + for i in ../$NCURSES*.sh.gz; + do TMP=$i; gunzip -c $i > ${TMP%.*}; + done; + for i in ../$NCURSES*.sh; + do chmod 775 $i && ./$i; + done; for i in ../$NCURSES*.patch.gz; do gunzip -c $i | patch -p1; done); @@ -649,14 +657,18 @@ if test "$VIM_SUPPORT" = guessed; then Download at http://www.vim.org/ ]) VIM_SUPPORT="-UVIM_SUPPORT" + DEBVIM= else VIM_SUPPORT="-DVIM_SUPPORT" + DEBVIM=vim fi else if test "$VIM_SUPPORT" = no; then VIM_SUPPORT="-UVIM_SUPPORT" + DEBVIM= else VIM_SUPPORT="-DVIM_SUPPORT" + DEBVIM=vim fi fi @@ -783,6 +795,7 @@ fi if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPPORT"; then MYSQL_LIB=no + if test $MYSQL_LIB = no; then AC_MSG_CHECKING(for libmysql libraries in $libMySQLlib) saved_LIBS="$LIBS" @@ -806,9 +819,13 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP fi fi +DEBMYSQL= + if test "$MYSQL_SUPPORT" != "-DMYSQL_SUPPORT"; then libMySQLinc= libMySQLlib= +else + DEBMYSQL=", libmysqlclient18" fi AC_SUBST(MYSQL_SUPPORT) @@ -952,9 +969,13 @@ if test "$POSTGRESQL_SUPPORT" = "-DPOSTG fi fi +DEBPQ= + if test "$POSTGRESQL_SUPPORT" != "-DPOSTGRESQL_SUPPORT"; then libPgSQLinc= libPgSQLlib= +else + DEBPQ=", libpq5" fi AC_SUBST(POSTGRESQL_SUPPORT) @@ -1266,6 +1287,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) @@ -1279,6 +1314,7 @@ AC_SUBST(SEMUN) AC_SUBST(IPV6) AC_SUBST(BSH_PATH) AC_SUBST(ELF) +AC_SUBST(ARCH) AC_SUBST(NCURSES) AC_SUBST(READLINE) @@ -1314,6 +1350,10 @@ AC_SUBST(FFLAGS) AC_SUBST(FCFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(DEBPQ) +AC_SUBST(DEBMYSQL) +AC_SUBST(DEBVIM) + if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$NCURSES) AC_CONFIG_SUBDIRS(tools/$READLINE) @@ -1356,4 +1396,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