--- rpl/Attic/configure 2010/07/31 10:34:15 1.30 +++ rpl/Attic/configure 2010/08/15 14:46:23 1.35 @@ -610,9 +610,14 @@ GSL UNITS READLINE NCURSES +BROKEN_SIGINFO +IPV6 +SEMUN +SEMAPHORES_SYSV SEMAPHORES_NOMMES NESTED_FUNCTIONS EXPORT_DYNAMIC +C_STANDARD OS GNUPLOT_COMPILATION subdirs @@ -1845,6 +1850,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 @@ -2182,60 +2241,6 @@ 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. @@ -3211,7 +3216,7 @@ GPP=gpp-2.24 GNUPLOT=gnuplot-4.4.0 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.0 +SQLITE=sqlite-3.7.0.1 OPENSSL=openssl-1.0.0a ac_ext=c @@ -5870,11 +5875,15 @@ if test "${enable_final_encoding+set}" = if test "$enableval" = "no"; then FINAL_ENCODING="\$(shell locale charmap | \ \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')" + FORCED_FINAL_ENCODING=0 else FINAL_ENCODING="$enable_final_encoding" + FORCED_FINAL_ENCODING=1 fi else - FINAL_ENCODING="\$(shell locale charmap | \ + +FORCED_FINAL_ENCODING=0 +FINAL_ENCODING="\$(shell locale charmap | \ \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')" fi @@ -6066,6 +6075,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 | \ @@ -6083,6 +6098,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 | \ @@ -6902,6 +6918,29 @@ 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 +#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; } @@ -8757,6 +8796,46 @@ cat >>confdefs.h <<_ACEOF _ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken siginfo->si_pid" >&5 +$as_echo_n "checking for broken siginfo->si_pid... " >&6; } +if test "$cross_compiling" = yes; then : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run test program while cross compiling +See \`config.log' for more details." "$LINENO" 5; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int flag; +void handler(int signal, siginfo_t *siginfo, void *context) +{ flag = ((*siginfo).si_pid == getpid()) ? 0 : -1; } +int +main () +{ +struct sigaction action; +action.sa_sigaction = handler; +action.sa_flags = SA_SIGINFO; +sigaction(SIGUSR1, &action, NULL); +raise(SIGUSR1); +return(flag); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + BROKEN_SIGINFO=-U_BROKEN_SIGINFO; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + BROKEN_SIGINFO=-D_BROKEN_SIGINFO; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5 $as_echo_n "checking for working strcoll... " >&6; } if test "${ac_cv_func_strcoll_works+set}" = set; then : @@ -8885,7 +8964,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 @@ -8906,27 +9008,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 | \ @@ -8997,34 +9078,93 @@ 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= + if test FORCED_FINAL_ENCODING -eq 0; then \ + FINAL_ENCODING=CP850; \ + fi; + OS=OS2 + 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;; + + OpenBSD) + if test FORCED_FINAL_ENCODING -eq 0; then \ + FINAL_ENCODING=UTF-8; \ + fi; + 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;; + *) - 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 + + + + +