--- rpl/Attic/configure 2010/01/29 16:51:46 1.2 +++ rpl/Attic/configure 2010/05/24 10:58:27 1.25 @@ -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.10. +# Generated by GNU Autoconf 2.65 for rpl 4.0.16. # # # 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.10' -PACKAGE_STRING='rpl 4.0.10' +PACKAGE_VERSION='4.0.16' +PACKAGE_STRING='rpl 4.0.16' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -596,8 +596,11 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +MALLOC DATE_FR FINAL_ENCODING +OPENSSL +SQLITE ICONV FILE GNUPLOT @@ -606,7 +609,10 @@ GSL UNITS READLINE NCURSES -LIBMTMALLOC +SEMAPHORES_NOMMES +NESTED_FUNCTIONS +EXPORT_DYNAMIC +OS GNUPLOT_COMPILATION subdirs EGREP @@ -638,9 +644,7 @@ SED RANLIB LN_S RUNPATH -LIBTOOLIZE PROFILAGE -DEBUG_CODE X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -766,6 +770,7 @@ enable_profile enable_final_run_path with_mysql with_postgresql +with_openssl_arch ' ac_precious_vars='build_alias host_alias @@ -786,11 +791,12 @@ XMKMF CPP' ac_subdirs_all='tools/$NCURSES tools/$READLINE -tools/$UNITS tools/$GSL tools/$GPP tools/$FILE tools/$ICONV +tools/$SQLITE +tools/$UNITS tools/$GNUPLOT' # Initialize some variables set by options. @@ -1332,7 +1338,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.10 to adapt to many kinds of systems. +\`configure' configures rpl 4.0.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1413,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rpl 4.0.10:";; + short | recursive ) echo "Configuration of rpl 4.0.16:";; esac cat <<\_ACEOF @@ -1435,6 +1441,7 @@ Optional Packages: --with-x use the X Window System --with-mysql=PATH specify directory for installed mysql --with-postgresql=PATH specify directory for installed postgresql + --with-openssl-arch=ARCH specify os and compiler for openssl (ARCH or list) Some influential environment variables: CC C compiler command @@ -1519,7 +1526,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rpl configure 4.0.10 +rpl configure 4.0.16 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2230,7 +2237,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.10, which was +It was created by rpl $as_me 4.0.16, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3149,7 +3156,7 @@ fi # Define the identity of the package. PACKAGE='rpl' - VERSION='4.0.10' + VERSION='4.0.16' cat >>confdefs.h <<_ACEOF @@ -3193,14 +3200,16 @@ am__tar='${AMTAR} chof - "$$tardir"'; am ac_config_headers="$ac_config_headers rplconfig.h" -NCURSES=ncurses-5.7-20100102 +NCURSES=ncurses-5.7-20100501 READLINE=readline-6.1 UNITS=units-1.87 -GSL=gsl-1.13 +GSL=gsl-1.14 GPP=gpp-2.24 -GNUPLOT=gnuplot-4.2.6 +GNUPLOT=gnuplot-4.4.0 FILE=file-5.03 ICONV=libiconv-1.13.1 +SQLITE=sqlite-3.6.23.1 +OPENSSL=openssl-1.0.0 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3208,7 +3217,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gcc-4.4 gcc + for ac_prog in gcc do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -3252,7 +3261,7 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in gcc-4.4 gcc + for ac_prog in gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -3996,13 +4005,18 @@ if test x"$CC" != x""; then awk -F. '{ printf("%s", $1);}'` GCC_VERSION_MINEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ awk -F. '{ printf("%s", $2);}'` - if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then + if test $GCC_VERSION_MAJEURE -ge 5; then OPTIMISATION_C=-O3 else - if test $GCC_VERSION_MAJEURE -ge 5; then + if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; \ + then OPTIMISATION_C=-O3 else - OPTIMISATION_C=-O2 + if test $GCC_VERSION_MAJEURE -ge 2; then + OPTIMISATION_C=-O2 + else + as_fn_error "Cannot find decent or recent gcc (gcc-4.2 or better)!" "$LINENO" 5 + fi fi fi fi @@ -4148,7 +4162,7 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++-4.4 g++ + for ac_prog in g++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4192,7 +4206,7 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++-4.4 g++ + for ac_prog in g++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4532,7 +4546,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4576,7 +4590,7 @@ fi fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4748,7 +4762,7 @@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_fc_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4792,7 +4806,7 @@ fi fi if test -z "$FC"; then ac_ct_FC=$FC - for ac_prog in gfortran-4.4 gfortran + for ac_prog in gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4959,13 +4973,17 @@ if test x"$FC" != x""; then awk -F. '{ printf("%s", $1);}'` GCC_VERSION_MINEURE=`$FC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ awk -F. '{ printf("%s", $2);}'` - if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then + if test $GCC_VERSION_MAJEURE -ge 5; then OPTIMISATION_F=-O3 else - if test $GCC_VERSION_MAJEURE -ge 5; then + if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then OPTIMISATION_F=-O3 else - OPTIMISATION_F=-O2 + if test $GCC_VERSION_MAJEURE -ge 3; then + OPTIMISATION_F=-O2 + else + as_fn_error "Cannot find decent or recent gfortran (gfortran-4.3 or better)!" "$LINENO" 5 + fi fi fi fi @@ -5832,12 +5850,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 @@ -5983,63 +6003,15 @@ fi if test "${enable_debug+set}" = set; then : 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 + DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS" + MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a" 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 -UDEBUG_ERREURS" + MALLOC="" fi else - -DEBUG_CODE="-UDEBUG" -DEBUG="" + DEBUG="-UDEBUG_MEMOIRE -UDEBUG_ERREURS" + MALLOC="\$(top_builddir)/ptmalloc3/libptmalloc3.a" fi @@ -6058,7 +6030,6 @@ fi - if test ! -d tools; then mkdir tools fi @@ -6084,199 +6055,22 @@ 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 - ) + (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1) fi if test ! -d "$srcdir"/tools/$ICONV; then gunzip -c "$srcdir"/tools/$ICONV.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; \ -fi - -# Extract the first word of "libtoolize", so it can be a program name with args. -set dummy libtoolize; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_LIBTOOLIZE+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LIBTOOLIZE"; then - ac_cv_prog_LIBTOOLIZE="$LIBTOOLIZE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIBTOOLIZE="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_LIBTOOLIZE" && ac_cv_prog_LIBTOOLIZE="no" -fi -fi -LIBTOOLIZE=$ac_cv_prog_LIBTOOLIZE -if test -n "$LIBTOOLIZE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBTOOLIZE" >&5 -$as_echo "$LIBTOOLIZE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$LIBTOOLIZE" = "no"; then - as_fn_error "Cannot find libtoolize! You have to install it." "$LINENO" 5 -fi - -# Extract the first word of "aclocal", so it can be a program name with args. -set dummy aclocal; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ACLOCAL+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ACLOCAL"; then - ac_cv_prog_ACLOCAL="$ACLOCAL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ACLOCAL="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_ACLOCAL" && ac_cv_prog_ACLOCAL="no" -fi -fi -ACLOCAL=$ac_cv_prog_ACLOCAL -if test -n "$ACLOCAL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ACLOCAL" >&5 -$as_echo "$ACLOCAL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$ACLOCAL" = "no"; then - as_fn_error "Cannot find aclocal! You have to install it." "$LINENO" 5 -fi - -# Extract the first word of "automake", so it can be a program name with args. -set dummy automake; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AUTOMAKE+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AUTOMAKE"; then - ac_cv_prog_AUTOMAKE="$AUTOMAKE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AUTOMAKE="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_AUTOMAKE" && ac_cv_prog_AUTOMAKE="no" -fi -fi -AUTOMAKE=$ac_cv_prog_AUTOMAKE -if test -n "$AUTOMAKE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOMAKE" >&5 -$as_echo "$AUTOMAKE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$AUTOMAKE" = "no"; then - as_fn_error "Cannot find automake! You have to install it." "$LINENO" 5 -fi - -# Extract the first word of "autoconf", so it can be a program name with args. -set dummy autoconf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AUTOCONF+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AUTOCONF"; then - ac_cv_prog_AUTOCONF="$AUTOCONF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AUTOCONF="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_AUTOCONF" && ac_cv_prog_AUTOCONF="no" -fi -fi -AUTOCONF=$ac_cv_prog_AUTOCONF -if test -n "$AUTOCONF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AUTOCONF" >&5 -$as_echo "$AUTOCONF" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ! -d "$srcdir"/tools/$SQLITE; then + gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ + (cd "$srcdir/tools" && tar -xf -) fi - - -if test "$AUTOCONF" = "no"; then - as_fn_error "Cannot find autoconf! You have to install it." "$LINENO" 5 +if test ! -d tools/$OPENSSL; then + gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ + (cd tools && tar -xf -) fi -(cd "$srcdir"/tools/$FILE && libtoolize --copy --force \ - && aclocal && automake -af && autoconf); - # Check whether --enable-final-run-path was given. @@ -6433,8 +6227,8 @@ else fi -# Extract the first word of "awk", so it can be a program name with args. -set dummy awk; ac_word=$2 +# Extract the first word of "nawk", so it can be a program name with args. +set dummy nawk; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AWK+set}" = set; then : @@ -6472,7 +6266,7 @@ fi if test "$AWK" = no; then - as_fn_error "Can not find awk !" "$LINENO" 5 + as_fn_error "Can not find nawk !" "$LINENO" 5 fi # Extract the first word of "sed", so it can be a program name with args. @@ -9055,14 +8849,14 @@ fi done +ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared --enable-static" + subdirs="$subdirs tools/$NCURSES" subdirs="$subdirs tools/$READLINE" -subdirs="$subdirs tools/$UNITS" - subdirs="$subdirs tools/$GSL" subdirs="$subdirs tools/$GPP" @@ -9071,6 +8865,31 @@ subdirs="$subdirs tools/$FILE" subdirs="$subdirs tools/$ICONV" +subdirs="$subdirs tools/$SQLITE" + +subdirs="$subdirs tools/$UNITS" + + + +# Check whether --with-openssl_arch was given. +if test "${with_openssl_arch+set}" = set; then : + withval=$with_openssl_arch; +else + with_openssl_arch=none +fi + + +if test "x$with_openssl_arch" = xnone; then + (cd tools/$OPENSSL && ./config) +elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then + (cd tools/$OPENSSL && ./Configure) + as_fn_error "OS/COMP informations are required!" "$LINENO" 5 +elif test "x$with_openssl_arch" = xlist; then + (cd tools/$OPENSSL && ./Configure) + as_fn_error "Please specify OS and Architecture" "$LINENO" 5 +else + (cd tools/$OPENSSL && ./Configure $with_openssl_arch) +fi if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then @@ -9118,14 +8937,60 @@ 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') -if test $(uname) = "SunOS"; then - LIBMTMALLOC=-lmtmalloc -else - LIBMTMALLOC= -fi +case $OS in + + Darwin) + EXPORT_DYNAMIC=-flat_namespace + NESTED_FUNCTIONS=-fnested-functions + SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" + break ;; + + Cygwin) + EXPORT_DYNAMIC=--export-all-symbols + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + break ;; + + AIX) + EXPORT_DYNAMIC=--export-dynamic + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + break ;; + + *) + EXPORT_DYNAMIC=--export-dynamic + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + break ;; + +esac + + + + + @@ -9172,10 +9037,14 @@ 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" +ac_config_files="$ac_config_files ptmalloc3/Makefile" + ac_config_files="$ac_config_files man/rpl.1" @@ -9723,7 +9592,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.10, which was +This file was extended by rpl $as_me 4.0.16, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9789,7 +9658,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.10 +rpl config.status 4.0.16 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -9927,8 +9796,10 @@ 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" ;; + "ptmalloc3/Makefile") CONFIG_FILES="$CONFIG_FILES ptmalloc3/Makefile" ;; "man/rpl.1") CONFIG_FILES="$CONFIG_FILES man/rpl.1" ;; "man/rplcc.1") CONFIG_FILES="$CONFIG_FILES man/rplcc.1" ;; "man/rpllink.1") CONFIG_FILES="$CONFIG_FILES man/rpllink.1" ;;