--- rpl/Attic/configure 2011/10/02 14:14:29 1.87 +++ rpl/Attic/configure 2011/10/03 15:57:51 1.88 @@ -676,6 +676,7 @@ subdirs LIBRPLCAS RPLCAS ABI +RPLTOOLS X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -790,7 +791,8 @@ enable_dependency_tracking with_x with_32bits_abi with_64bits_abi -with_rplcas +with_rpltools +enable_rplcas enable_optimization enable_sysv_ipcs enable_full_static @@ -1464,6 +1466,7 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-rplcas compile rplcas (default=no) --enable-optimization set compiler flags [default=environment variables -O3] --enable-sysv-ipcs use SystemV IPC functions [default=guessed] --enable-full-static build static RPL/2 engine [default=shared] @@ -1484,7 +1487,7 @@ Optional Packages: --with-x use the X Window System --with-32bits-abi force 32bits ABI (multilib) --with-64bits-abi force 64bits ABI (multilib) - --with-rplcas compile rplcas (default=no) + --with-rpltools specify rpltools path used for cross compilation --with-mysql=PATH specify directory for installed mysql --with-postgresql=PATH specify directory for installed postgresql --with-bourne-shell=PATH specify path for OS/2 bourne shell @@ -4838,10 +4841,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test "$F77" != gfortran -a "$F77" != gfortran-4.4; then - as_fn_error $? "Cannot find gfortran! You have to install it." "$LINENO" 5 -fi - ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' @@ -5049,7 +5048,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLA ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test "$FC" != gfortran -a "$FC" != gfortran-4.4; then +if test x"$F77" == x; then + as_fn_error $? "Cannot find gfortran! You have to install it." "$LINENO" 5 +fi + +if test x"$FC" == x; then as_fn_error $? "Cannot find gfortran! You have to install it." "$LINENO" 5 fi @@ -5947,10 +5950,28 @@ fi LDFLAGS="$LDFLAGS $ABI" -# Check whether --with-rplcas was given. -if test "${with_rplcas+set}" = set; then : - withval=$with_rplcas; -if test "$with-rplcas" = "no"; then +# Check whether --with-rpltools was given. +if test "${with_rpltools+set}" = set; then : + withval=$with_rpltools; +if test "$with_rpltools" = "no" -o "$with_rpltools" = yes; then + as_fn_error $? "You have to specify rpltools path !" "$LINENO" 5 +else + RPLTOOLS=$with_rpltools +fi +else + + RPLTOOLS=\$\(top_builddir\) + + +fi + + + + +# Check whether --enable-rplcas was given. +if test "${enable_rplcas+set}" = set; then : + enableval=$enable_rplcas; +if test "$enableval" = "no"; then RPLCAS=-URPLCAS LIBRPLCAS= else @@ -5999,12 +6020,15 @@ fi if test "${enable_sysv_ipcs+set}" = set; then : enableval=$enable_sysv_ipcs; if test "$enableval" = "no"; then - IPCS_SYSV=no + IPCS_SYSV=-UIPCS_SYSV + POSIX_IPCS=no else - IPCS_SYSV=yes + IPCS_SYSV=-DIPCS_SYSV + POSIX_IPCS=yes fi else REG=$LDFLAGS +POSIX_IPCS=guessed LDFLAGS=-lrt { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX semaphores and shared objects" >&5 $as_echo_n "checking for POSIX semaphores and shared objects... " >&6; } @@ -6053,7 +6077,7 @@ LDFLAGS=$REG fi -if test "$IPCS_SYSV" = "-UIPCS_SYSV"; then +if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then REG=$LDFLAGS LDFLAGS=-pthread { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX anonymous semaphores" >&5 @@ -9222,7 +9246,7 @@ fi -HOST=$host +HOST=$target my_save_cflags="$CFLAGS"