--- rpl/Attic/configure 2010/01/26 15:22:44 1.1.1.1 +++ rpl/Attic/configure 2010/03/06 18:29:05 1.9 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for rpl 4.0.9. +# Generated by GNU Autoconf 2.65 for rpl 4.0.12. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rpl' PACKAGE_TARNAME='rpl' -PACKAGE_VERSION='4.0.9' -PACKAGE_STRING='rpl 4.0.9' +PACKAGE_VERSION='4.0.12' +PACKAGE_STRING='rpl 4.0.12' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -598,6 +598,8 @@ LTLIBOBJS LIBOBJS DATE_FR FINAL_ENCODING +OPENSSL +SQLITE ICONV FILE GNUPLOT @@ -607,6 +609,7 @@ UNITS READLINE NCURSES LIBMTMALLOC +OS GNUPLOT_COMPILATION subdirs EGREP @@ -640,7 +643,6 @@ LN_S RUNPATH LIBTOOLIZE PROFILAGE -DEBUG_CODE X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -791,6 +793,7 @@ tools/$GSL tools/$GPP tools/$FILE tools/$ICONV +tools/$SQLITE tools/$GNUPLOT' # Initialize some variables set by options. @@ -1332,7 +1335,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rpl 4.0.9 to adapt to many kinds of systems. +\`configure' configures rpl 4.0.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1410,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rpl 4.0.9:";; + short | recursive ) echo "Configuration of rpl 4.0.12:";; esac cat <<\_ACEOF @@ -1519,7 +1522,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rpl configure 4.0.9 +rpl configure 4.0.12 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2230,7 +2233,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rpl $as_me 4.0.9, which was +It was created by rpl $as_me 4.0.12, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3149,7 +3152,7 @@ fi # Define the identity of the package. PACKAGE='rpl' - VERSION='4.0.9' + VERSION='4.0.12' cat >>confdefs.h <<_ACEOF @@ -3193,7 +3196,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am ac_config_headers="$ac_config_headers rplconfig.h" -NCURSES=ncurses-5.7-20100102 +NCURSES=ncurses-5.7-20100206 READLINE=readline-6.1 UNITS=units-1.87 GSL=gsl-1.13 @@ -3201,6 +3204,8 @@ GPP=gpp-2.24 GNUPLOT=gnuplot-4.2.6 FILE=file-5.03 ICONV=libiconv-1.13.1 +SQLITE=sqlite-3.6.22 +OPENSSL=openssl-0.9.8m ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5832,12 +5837,14 @@ fi if test "${enable_final_encoding+set}" = set; then : enableval=$enable_final_encoding; if test "$enableval" = "no"; then - FINAL_ENCODING="\$(shell locale charmap)" + FINAL_ENCODING="\$(shell locale charmap | \ + awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')" else FINAL_ENCODING="$enable_final_encoding" fi else - FINAL_ENCODING="\$(shell locale charmap)" + FINAL_ENCODING="\$(shell locale charmap | \ + awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')" fi @@ -5984,62 +5991,11 @@ if test "${enable_debug+set}" = set; the enableval=$enable_debug; if test "$enableval" = "no"; then DEBUG="" - DEBUG_CODE="-UDEBUG" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEBUG=\"-lefence\" in -lefence" >&5 -$as_echo_n "checking for DEBUG=\"-lefence\" in -lefence... " >&6; } -if test "${ac_cv_lib_efence_DEBUG___lefence_+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lefence $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char DEBUG="-lefence" (); -int -main () -{ -return DEBUG="-lefence" (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_efence_DEBUG___lefence_=yes -else - ac_cv_lib_efence_DEBUG___lefence_=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_DEBUG___lefence_" >&5 -$as_echo "$ac_cv_lib_efence_DEBUG___lefence_" >&6; } -if test "x$ac_cv_lib_efence_DEBUG___lefence_" = x""yes; then : - DEBUG="" -fi - - DEBUG_CODE="-DDEBUG" - if test "$DEBUG" = ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can not find efence! You may install it. -Debug flag is disabled. -" >&5 -$as_echo "$as_me: WARNING: Can not find efence! You may install it. -Debug flag is disabled. -" >&2;} - fi + DEBUG="-DDEBUG_MEMOIRE" fi else - -DEBUG_CODE="-UDEBUG" -DEBUG="" + DEBUG="" fi @@ -6058,7 +6014,6 @@ fi - if test ! -d tools; then mkdir tools fi @@ -6084,34 +6039,29 @@ if test ! -d "$srcdir"/tools/$GPP; then fi if test ! -d "$srcdir"/tools/$FILE; then gunzip -c "$srcdir"/tools/$FILE.tar.gz | \ - (cd "$srcdir/tools" && tar -xf -) + (cd "$srcdir/tools" && tar -xf - ) + TMP=$(mktemp) + (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1) + sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > $TMP + sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' $TMP | \ + sed 's/^file_/rplfile_/g' > \ + "$srcdir"/tools/$FILE/src/Makefile.am + sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > $TMP + \mv -f $TMP "$srcdir"/tools/$FILE/magic/Makefile.am + (cd "$srcdir"/tools/$FILE && libtoolize --copy --force \ + && aclocal && automake -af && autoconf); fi if test ! -d "$srcdir"/tools/$ICONV; then gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) fi - -ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf" -if test "x$ac_cv_func_asprintf" = x""yes; then : - ASPRINTF=found -else - ASPRINTF=not_found +if test ! -d "$srcdir"/tools/$SQLITE; then + gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ + (cd "$srcdir/tools" && tar -xf -) fi - - -sed 's/libmagic/librplfile/g' "$srcdir"/tools/$FILE/src/Makefile.am > \ - "$srcdir"/tools/$FILE/src/Makefile.am2 -sed 's/^bin_PROGRAMS = file/bin_PROGRAMS = rplfile/g' \ - "$srcdir"/tools/$FILE/src/Makefile.am2 | \ - sed 's/^file_/rplfile_/g' > \ - "$srcdir"/tools/$FILE/src/Makefile.am -\rm -f "$srcdir"/tools/$FILE/src/Makefile.am2 -if test $(grep rplfile "$srcdir"/tools/$FILE/magic/Makefile.am | wc -l) \ - -eq 0; then \ - sed 's/file$/rplfile/g' "$srcdir"/tools/$FILE/magic/Makefile.am > \ - "$srcdir"/tools/$FILE/src/Makefile.am2; \ - \mv -f "$srcdir"/tools/$FILE/src/Makefile.am2 \ - "$srcdir"/tools/$FILE/magic/Makefile.am; \ +if test ! -d tools/$OPENSSL; then + gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ + (cd tools && tar -xf -) fi # Extract the first word of "libtoolize", so it can be a program name with args. @@ -6282,16 +6232,6 @@ if test "$AUTOCONF" = "no"; then as_fn_error "Cannot find autoconf! You have to install it." "$LINENO" 5 fi -if test "$ASPRINTF" = not_found; then - if test -z "$(grep asprintf.c \ - "$srcdir"/tools/$FILE/src/Makefile.am)"; then - echo Not needed anymore - fi -fi - -(cd "$srcdir"/tools/$FILE && libtoolize --copy --force \ - && aclocal && automake -af && autoconf); - # Check whether --enable-final-run-path was given. @@ -9086,6 +9026,9 @@ subdirs="$subdirs tools/$FILE" subdirs="$subdirs tools/$ICONV" +subdirs="$subdirs tools/$SQLITE" + +tools/$OPENSSL/config if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then @@ -9133,6 +9076,24 @@ case $host_cpu in esac +case $host_os in + + cygwin*) + OS=Cygwin + break ;; + + interix*) + OS=Interix + break ;; + + *) + OS=$(uname) + break ;; + +esac + + + DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z') DATE=$(env LC_ALL=C date +'%A %x, %X %Z') @@ -9161,6 +9122,8 @@ fi + + ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files COPYING" @@ -9187,6 +9150,8 @@ ac_config_files="$ac_config_files rpltag ac_config_files="$ac_config_files rpliconv/Makefile" +ac_config_files="$ac_config_files rplsums/Makefile" + ac_config_files="$ac_config_files lapack/lapack/Makefile" ac_config_files="$ac_config_files lapack/blas/Makefile" @@ -9738,7 +9703,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rpl $as_me 4.0.9, which was +This file was extended by rpl $as_me 4.0.12, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9804,7 +9769,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rpl config.status 4.0.9 +rpl config.status 4.0.12 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -9942,6 +9907,7 @@ do "scripts/rpllink") CONFIG_FILES="$CONFIG_FILES scripts/rpllink" ;; "rpltags/Makefile") CONFIG_FILES="$CONFIG_FILES rpltags/Makefile" ;; "rpliconv/Makefile") CONFIG_FILES="$CONFIG_FILES rpliconv/Makefile" ;; + "rplsums/Makefile") CONFIG_FILES="$CONFIG_FILES rplsums/Makefile" ;; "lapack/lapack/Makefile") CONFIG_FILES="$CONFIG_FILES lapack/lapack/Makefile" ;; "lapack/blas/Makefile") CONFIG_FILES="$CONFIG_FILES lapack/blas/Makefile" ;; "man/rpl.1") CONFIG_FILES="$CONFIG_FILES man/rpl.1" ;;