--- rpl/Attic/configure 2010/06/24 10:10:38 1.28 +++ rpl/Attic/configure 2010/08/13 21:02:18 1.34 @@ -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.17. +# Generated by GNU Autoconf 2.65 for rpl 4.0.18. # # # 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.17' -PACKAGE_STRING='rpl 4.0.17' +PACKAGE_VERSION='4.0.18' +PACKAGE_STRING='rpl 4.0.18' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -596,6 +596,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +EXT_SQL MALLOC DATE_FR FINAL_ENCODING @@ -609,9 +610,13 @@ GSL UNITS READLINE NCURSES +IPV6 +SEMUN +SEMAPHORES_SYSV SEMAPHORES_NOMMES NESTED_FUNCTIONS EXPORT_DYNAMIC +C_STANDARD OS GNUPLOT_COMPILATION subdirs @@ -758,6 +763,7 @@ enable_option_checking enable_dependency_tracking with_x enable_optimization +enable_full_static enable_final_encoding enable_tex enable_vim @@ -1338,7 +1344,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.17 to adapt to many kinds of systems. +\`configure' configures rpl 4.0.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1419,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rpl 4.0.17:";; + short | recursive ) echo "Configuration of rpl 4.0.18:";; esac cat <<\_ACEOF @@ -1424,6 +1430,7 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-optimization set compiler flags [default=environment variables -O3] + --enable-full-static build static RPL/2 engine [default=shared] --enable-final-encoding force final encoding [default=guessed] --enable-tex provide the TeX support [default=guessed] --enable-vim provide the vim support [default=guessed] @@ -1526,7 +1533,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rpl configure 4.0.17 +rpl configure 4.0.18 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1842,6 +1849,60 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_func +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_type + # ac_fn_c_try_run LINENO # ---------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -2179,65 +2240,11 @@ fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_mongrel - -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_type 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.17, which was +It was created by rpl $as_me 4.0.18, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3156,7 +3163,7 @@ fi # Define the identity of the package. PACKAGE='rpl' - VERSION='4.0.17' + VERSION='4.0.18' cat >>confdefs.h <<_ACEOF @@ -3202,13 +3209,13 @@ ac_config_headers="$ac_config_headers rp NCURSES=ncurses-5.7-20100619 READLINE=readline-6.1 -UNITS=units-1.87 +UNITS=units-1.88 GSL=gsl-1.14 GPP=gpp-2.24 GNUPLOT=gnuplot-4.4.0 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.6.23.1 +SQLITE=sqlite-3.7.0.1 OPENSSL=openssl-1.0.0a ac_ext=c @@ -4000,6 +4007,8 @@ fi +EXT_SQL= + if test x"$CC" != x""; then GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ awk -F. '{ printf("%s", $1);}'` @@ -5846,6 +5855,19 @@ else fi +# Check whether --enable-full-static was given. +if test "${enable_full_static+set}" = set; then : + enableval=$enable_full_static; +if test "$enableval" = "no"; then + STATIC=no +else + STATIC=yes +fi +else + STATIC=no +fi + + # Check whether --enable-final-encoding was given. if test "${enable_final_encoding+set}" = set; then : enableval=$enable_final_encoding; @@ -6048,6 +6070,12 @@ fi if test ! -d "$srcdir"/tools/$GSL; then gunzip -c "$srcdir"/tools/$GSL.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) + if test $(uname) = "OS/2"; then + (cd "$srcdir"/tools/$GSL; \ + TMP=$(mktemp tmp.XXXXXXXXXX); \ + sed -e '1,$s/\${1+"\$@"}/"\$@"/g' ltmain.sh > $TMP; \ + \mv -f $TMP ltmain.sh) + fi fi if test ! -d "$srcdir"/tools/$GPP; then gunzip -c "$srcdir"/tools/$GPP.tar.gz | \ @@ -6065,6 +6093,7 @@ fi if test ! -d "$srcdir"/tools/$SQLITE; then gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) + (cd "$srcdir/tools"/$SQLITE && gunzip -c ../$SQLITE.diff.gz | patch -p1) fi if test ! -d tools/$OPENSSL; then gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ @@ -6884,6 +6913,28 @@ else fi +ac_fn_c_check_type "$LINENO" "union semun" "ac_cv_type_union_semun" " +#include + +" +if test "x$ac_cv_type_union_semun" = x""yes; then : + SEMUN=-DUNION_SEMUN +else + SEMUN=-UUNION_SEMUN +fi + + +ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" " +#include + +" +if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then : + IPV6=-DIPV6 +else + IPV6=-UIPV6 +fi + + if test "$CYGWIN" != yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -7030,12 +7081,12 @@ fi if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then libMySQLinc="-I/usr/include" - libMySQLlib="-L/usr/lib" + libMySQLlib="/usr/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in /usr/include" >&5 $as_echo_n "checking for libmysql includes in /usr/include... " >&6; } saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $libMySQLinc" + CFLAGS="$CFLAGS -L/$libMySQLinc" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "mysql.h" @@ -7149,7 +7200,7 @@ rm -f core conftest.err conftest.$ac_obj else if test "x$with_mysql" != xno; then libMySQLinc="-I$with_mysql/include" - libMySQLlib="-L$with_mysql/lib" + libMySQLlib="$with_mysql/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in $with_mysql" >&5 $as_echo_n "checking for libmysql includes in $with_mysql... " >&6; } @@ -7217,7 +7268,11 @@ if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql libraries in $libMySQLlib" >&5 $as_echo_n "checking for libmysql libraries in $libMySQLlib... " >&6; } saved_LIBS="$LIBS" - LIBS="$LIBS $libMySQLlib $libMySQLinc -lmysqlclient_r" + if test $STATIC = no; then + LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc" + else + LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc" + fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "mysql.h" @@ -7239,7 +7294,12 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$saved_LIBS; - libMySQLlib="$libMySQLlib -lmysqlclient_r" + if test $STATIC = no; then + libMySQLlib="-L/$libMySQLlib -lmysqlclient_r" + else + libMySQLlib="$libMySQLlib/libmysqlclient_r.a" + EXT_SQL="$EXT_SQL $libMySQLlib" + fi fi if test $MYSQL_LIB = no; then @@ -7271,7 +7331,7 @@ fi if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then libPgSQLinc="-I/usr/include" - libPgSQLlib="-L/usr/lib" + libPgSQLlib="/usr/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in /usr/include" >&5 $as_echo_n "checking for libpq includes in /usr/include... " >&6; } @@ -7453,7 +7513,7 @@ rm -f core conftest.err conftest.$ac_obj else if test "x$with_postgresql" != xno; then libPgSQLinc="-I$with_postgresql/include" - libPgSQLlib="-L$with_postgresql/lib" + libPgSQLlib="$with_postgresql/lib" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in $libPgSQLinc" >&5 $as_echo_n "checking for libpq includes in $libPgSQLinc... " >&6; } @@ -7553,7 +7613,11 @@ if test "$POSTGRESQL_SUPPORT" = "-DPOSTG { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq libraries in $libPgSQLlib" >&5 $as_echo_n "checking for libpq libraries in $libPgSQLlib... " >&6; } saved_LIBS="$LIBS" - LIBS="$LIBS $libPgSQLlib $libPgSQLinc -lpq" + if test $STATIC = no; then + LIBS="$LIBS -L/$libPgSQLlib $libPgSQLinc -lpq" + else + LIBS="$LIBS $libPgSQLlib/libpq.a $libPgSQLinc" + fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "libpq-fe.h" @@ -7576,7 +7640,12 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$saved_LIBS; - libPgSQLlib="$libPgSQLlib -lpq" + if test $STATIC = no; then + libPgSQLlib="-L/$libPgSQLlib -lpq" + else + libPgSQLlib="$libPgSQLlib/libpq.a" + EXT_SQL="$EXT_SQL $libPgSQLlib" + fi fi fi @@ -8849,7 +8918,30 @@ fi done -ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared --enable-static" + +# 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 $(uname) = "OS/2"; then + bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd" +else + 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 +fi @@ -8870,27 +8962,6 @@ 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 gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ @@ -8961,28 +9032,67 @@ DATE=$(env LC_ALL=C date +'%A %x, %X %Z' case $OS in Darwin) - EXPORT_DYNAMIC=-flat_namespace + EXPORT_DYNAMIC=-Wl,-flat_namespace NESTED_FUNCTIONS=-fnested-functions SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; - Cygwin) - EXPORT_DYNAMIC=--export-all-symbols + Cygwin) + EXPORT_DYNAMIC=-Wl,--export-all-symbols NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; - AIX) - EXPORT_DYNAMIC=--export-dynamic + Interix) + EXPORT_DYNAMIC=-Wl,--export-all-symbols + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 + break;; + + AIX) + EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; + OS/2) + MALLOC= + OS=OS2 + FINAL_ENCODING=CP850 + NESTED_FUNCTIONS= + EXPORT_DYNAMIC=-Zmap + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-DSEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --without-readline \ + --without-cairo --disable-shared --enable-static" + C_STANDARD= + break;; + *) - EXPORT_DYNAMIC=--export-dynamic + EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; esac @@ -9011,6 +9121,11 @@ esac + + + + + ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files COPYING" @@ -9592,7 +9707,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.17, which was +This file was extended by rpl $as_me 4.0.18, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9658,7 +9773,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.17 +rpl config.status 4.0.18 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\"