--- rpl/configure.ac 2011/10/05 13:14:17 1.5 +++ rpl/configure.ac 2012/03/01 10:14:02 1.20 @@ -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.7]) 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,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.0g OPENMOTIF=openmotif-2.3.3 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.6 @@ -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) @@ -164,6 +165,17 @@ fi LDFLAGS="$LDFLAGS $ABI" +AC_ARG_ENABLE(recursive, +[ --enable-recursive recursive configuration (default=yes)],[ +if test "$enableval" = "yes"; then + RECURSIVE=yes +else + RECURSIVE=no +fi],[ + RECURSIVE=yes + ] +) + AC_ARG_WITH(rpltools, [ --with-rpltools specify rpltools path used for cross compilation],[ if test "$with_rpltools" = "no" -o "$with_rpltools" = yes; then @@ -196,17 +208,6 @@ AC_SUBST(ABI) AC_SUBST(RPLCAS) AC_SUBST(LIBRPLCAS) -AC_ARG_ENABLE(shared-memory, -[ --enable-shared-memory enable shared memory [[default=yes]]], [ -if test "$enableval" = "no"; then - SHARED_MEMORY="-USHARED_MEMORY" -else - SHARED_MEMORY="-DSHARED_MEMORY" -fi],[ - SHARED_MEMORY="-USHARED_MEMORY"]) - -AC_SUBST(SHARED_MEMORY) - dnl Options AC_ARG_ENABLE(optimization, [ --enable-optimization set compiler flags [[default=environment variables -O3]]], [ @@ -228,6 +229,37 @@ fi],[ ] ) +AC_MSG_CHECKING([for usable shared memory]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include + ], + [ return(0); ])], +[SHARED_MEMORY=-DSHARED_MEMORY; AC_MSG_RESULT(yes)], +[SHARED_MEMORY=-USHARED_MEMORY; AC_MSG_RESULT(no)] + ) +AC_SUBST(SHARED_MEMORY) + +AC_MSG_CHECKING([for pselect]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#include + #include + #include + #include + ], + [ + struct timespec tv; + fd_set s1, s2, s3; + tv.tv_sec=1; + tv.tv_nsec=0; + FD_SET(1, &s1); FD_SET(2, &s2); FD_SET(3, &s3); + pselect(5, &s1, &s2, &s3, &tv, NULL); + return(0); + ])], +[PSELECT=-DPSELECT; AC_MSG_RESULT(yes)], +[PSELECT=-UPSELECT; AC_MSG_RESULT(no)] + ) +AC_SUBST(PSELECT) + AC_ARG_ENABLE(sysv-ipcs, [ --enable-sysv-ipcs use SystemV IPC functions [[default=guessed]]], [ if test "$enableval" = "no"; then @@ -318,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) @@ -370,15 +404,18 @@ else fi) 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 \ \$(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" - AC_CONFIG_SUBDIRS(tools/$LIBXPM) - AC_CONFIG_SUBDIRS(tools/$OPENMOTIF) + + if test $RECURSIVE = yes; then + AC_CONFIG_SUBDIRS(tools/$LIBXPM) + AC_CONFIG_SUBDIRS(tools/$OPENMOTIF) + fi; fi AC_ARG_ENABLE(experimental, @@ -415,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); @@ -614,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 @@ -748,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" @@ -771,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) @@ -917,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) @@ -1030,7 +1086,11 @@ if test "$MYGNUPLOT" = "yes"; then gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) fi - AC_CONFIG_SUBDIRS(tools/$GNUPLOT) + + if test $RECURSIVE = yes; then + AC_CONFIG_SUBDIRS(tools/$GNUPLOT) + fi + GNUPLOT_COMPILATION=$GNUPLOT else GNUPLOT_COMPILATION= @@ -1217,16 +1277,33 @@ case $OS in OS2) WHOLE_LIB1="" WHOLE_LIB2="" + LIB_PREFIX="" break ;; *) WHOLE_LIB1="-Wl,-whole-archive" WHOLE_LIB2="-Wl,-no-whole-archive" + LIB_PREFIX="lib" + 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) AC_SUBST(C_STANDARD) AC_SUBST(EXPORT_DYNAMIC) @@ -1237,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) @@ -1272,15 +1350,21 @@ AC_SUBST(FFLAGS) AC_SUBST(FCFLAGS) AC_SUBST(LDFLAGS) -AC_CONFIG_SUBDIRS(tools/$NCURSES) -AC_CONFIG_SUBDIRS(tools/$READLINE) -AC_CONFIG_SUBDIRS(tools/$GSL) -AC_CONFIG_SUBDIRS(tools/$GPP) -AC_CONFIG_SUBDIRS(tools/$FILE) -AC_CONFIG_SUBDIRS(tools/$ICONV) -AC_CONFIG_SUBDIRS(tools/$SQLITE) -AC_CONFIG_SUBDIRS(tools/$UNITS) -AC_CONFIG_SUBDIRS(tools/$SIGSEGV) +AC_SUBST(DEBPQ) +AC_SUBST(DEBMYSQL) +AC_SUBST(DEBVIM) + +if test $RECURSIVE = yes; then + AC_CONFIG_SUBDIRS(tools/$NCURSES) + AC_CONFIG_SUBDIRS(tools/$READLINE) + AC_CONFIG_SUBDIRS(tools/$GSL) + AC_CONFIG_SUBDIRS(tools/$GPP) + AC_CONFIG_SUBDIRS(tools/$FILE) + AC_CONFIG_SUBDIRS(tools/$ICONV) + AC_CONFIG_SUBDIRS(tools/$SQLITE) + AC_CONFIG_SUBDIRS(tools/$UNITS) + AC_CONFIG_SUBDIRS(tools/$SIGSEGV) +fi AC_CONFIG_FILES(Makefile) AC_CONFIG_FILES(COPYING) @@ -1312,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