--- rpl/Attic/configure 2011/09/26 15:57:34 1.86 +++ rpl/Attic/configure 2011/10/02 14:14:29 1.87 @@ -792,7 +792,7 @@ with_32bits_abi with_64bits_abi with_rplcas enable_optimization -enable_sysv_semaphores +enable_sysv_ipcs enable_full_static enable_final_encoding enable_tex @@ -3262,7 +3262,7 @@ GPP=gpp-3.0 GNUPLOT=gnuplot-4.4.3 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.7.1 +SQLITE=sqlite-3.7.8 OPENSSL=openssl-1.0.0e OPENMOTIF=openmotif-2.3.3 LIBXPM=libXpm-3.5.9 @@ -4602,7 +4602,7 @@ fi -if test "$CXX" != "g++"; then +if test "$GXX" != yes; then as_fn_error $? "Cannot find g++! You have to install it." "$LINENO" 5 fi @@ -5995,9 +5995,9 @@ else fi -# Check whether --enable-sysv-semaphores was given. -if test "${enable_sysv_semaphores+set}" = set; then : - enableval=$enable_sysv_semaphores; +# Check whether --enable-sysv-ipcs was given. +if test "${enable_sysv_ipcs+set}" = set; then : + enableval=$enable_sysv_ipcs; if test "$enableval" = "no"; then IPCS_SYSV=no else @@ -7064,7 +7064,51 @@ else as_fn_error $? "Can not find libm !" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lc" >&5 +$as_echo_n "checking for pthread_mutex_init in -lc... " >&6; } +if ${ac_cv_lib_c_pthread_mutex_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lc $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 pthread_mutex_init (); +int +main () +{ +return pthread_mutex_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_c_pthread_mutex_init=yes +else + ac_cv_lib_c_pthread_mutex_init=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_c_pthread_mutex_init" >&5 +$as_echo "$ac_cv_lib_c_pthread_mutex_init" >&6; } +if test "x$ac_cv_lib_c_pthread_mutex_init" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBC 1 +_ACEOF + + LIBS="-lc $LIBS" + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 $as_echo_n "checking for main in -lpthread... " >&6; } if ${ac_cv_lib_pthread_main+:} false; then : $as_echo_n "(cached) " >&6 @@ -7105,6 +7149,8 @@ else as_fn_error $? "Can not find libpthread !" "$LINENO" 5 fi +fi + ac_fn_c_check_type "$LINENO" "union semun" "ac_cv_type_union_semun" " #include @@ -9179,39 +9225,83 @@ fi HOST=$host -case $host_cpu in +my_save_cflags="$CFLAGS" +FPCFLAGS="" - i?86) - CFLAGS="$CFLAGS -malign-double -mieee-fp -Wall -funsigned-char \ - -Wno-pointer-sign" - FFLAGS="$FFLAGS -malign-double -mieee-fp -Wall -fno-f2c" - FCFLAGS="$FCFLAGS -malign-double -mieee-fp -Wall -fno-f2c" - break ;; - - x86_64*) - CFLAGS="$CFLAGS -malign-double -mieee-fp -Wall -funsigned-char \ - -Wno-pointer-sign" - FFLAGS="$FFLAGS -malign-double -mieee-fp -Wall -fno-f2c" - FCFLAGS="$FCFLAGS -malign-double -mieee-fp -Wall -fno-f2c" - break ;; - - alpha*) - CFLAGS="$CFLAGS -mieee -funsigned-char -Wall \ - -Wno-pointer-sign" - FFLAGS="$FFLAGS -mieee -Wall" - FCFLAGS="$FCFLAGS -mieee -Wall" - break ;; - - sparc*) - CFLAGS="$CFLAGS -Wall -funsigned-char \ - -Wno-pointer-sign" - FFLAGS="$FFLAGS -Wall" - FCFLAGS="$FCFLAGS -Wall" - break ;; +CFLAGS=-malign-double +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CC supports -malign-double" >&5 +$as_echo_n "checking whether CC supports -malign-double... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -esac +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; FPCFLAGS="$FPCFLAGS -malign-double" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS=-mieee-fp +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CC supports -mieee-fp" >&5 +$as_echo_n "checking whether CC supports -mieee-fp... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; FPCFLAGS="$FPCFLAGS -mieee-fp" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS=-mieee +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CC supports -mieee" >&5 +$as_echo_n "checking whether CC supports -mieee... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; }; FPCFLAGS="$FPCFLAGS -mieee" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS=$my_save_cflags + +CFLAGS="$CFLAGS $FPCFLAGS -Wall -funsigned-char -Wno-pointer-sign" +FFLAGS="$FFLAGS $FPCFLAGS -Wall -fno-f2c" +FCFLAGS="$FCFLAGS $FPCFLAGS -Wall -fno-f2c" +CXXFLAGS="$CXXFLAGS $FPCFLAGS -Wall -funsigned-char" -case $host_os in +case $target_os in cygwin*) OS=Cygwin