--- rpl/configure.ac 2011/10/02 14:14:29 1.2 +++ rpl/configure.ac 2011/10/03 15:57:51 1.3 @@ -90,14 +90,14 @@ fi dnl Checks for Fortran 77 compiler AC_PROG_F77(gfortran) -if test "$F77" != gfortran -a "$F77" != gfortran-4.4; then - AC_MSG_ERROR([Cannot find gfortran! You have to install it.]) -fi - dnl Check for Fortran 9* compiler AC_PROG_FC(gfortran) -if test "$FC" != gfortran -a "$FC" != gfortran-4.4; then +if test x"$F77" == x; then + AC_MSG_ERROR([Cannot find gfortran! You have to install it.]) +fi + +if test x"$FC" == x; then AC_MSG_ERROR([Cannot find gfortran! You have to install it.]) fi @@ -164,10 +164,23 @@ fi LDFLAGS="$LDFLAGS $ABI" +AC_ARG_WITH(rpltools, +[ --with-rpltools specify rpltools path used for cross compilation],[ +if test "$with_rpltools" = "no" -o "$with_rpltools" = yes; then + AC_MSG_ERROR([You have to specify rpltools path !]) +else + RPLTOOLS=$with_rpltools +fi],[ + RPLTOOLS=\$\(top_builddir\) + ] +) + +AC_SUBST(RPLTOOLS) + dnl RPL/CAS support -AC_ARG_WITH(rplcas, -[ --with-rplcas compile rplcas (default=no)],[ -if test "$with-rplcas" = "no"; then +AC_ARG_ENABLE(rplcas, +[ --enable-rplcas compile rplcas (default=no)],[ +if test "$enableval" = "no"; then RPLCAS=-URPLCAS LIBRPLCAS= else @@ -207,11 +220,14 @@ fi],[ AC_ARG_ENABLE(sysv-ipcs, [ --enable-sysv-ipcs use SystemV IPC functions [[default=guessed]]], [ 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], REG=$LDFLAGS +POSIX_IPCS=guessed LDFLAGS=-lrt [AC_MSG_CHECKING([for POSIX semaphores and shared objects]) AC_RUN_IFELSE( @@ -234,7 +250,7 @@ fd = shm_open(sem , O_CREAT | O_RDWR, S_ LDFLAGS=$REG ) -if test "$IPCS_SYSV" = "-UIPCS_SYSV"; then +if test "$IPCS_SYSV" = "-UIPCS_SYSV" -a "$POSIX_IPCS" = "guessed"; then REG=$LDFLAGS LDFLAGS=-pthread AC_MSG_CHECKING([for POSIX anonymous semaphores]) @@ -1011,7 +1027,7 @@ fi AC_SUBST(GNUPLOT_COMPILATION) -HOST=$host +HOST=$target AC_SUBST(HOST) my_save_cflags="$CFLAGS"