--- rpl/Attic/configure.in 2010/08/26 19:07:33 1.40 +++ rpl/Attic/configure.in 2010/09/07 12:54:03 1.41 @@ -15,7 +15,7 @@ GPP=gpp-2.24 GNUPLOT=gnuplot-4.4.0 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.0.1 +SQLITE=sqlite-3.7.2 OPENSSL=openssl-1.0.0a dnl Checks for C compiler @@ -328,7 +328,10 @@ AC_PROG_RANLIB dnl Checks for nawk AC_CHECK_PROG(AWK, nawk, yes, no) if test "$AWK" = no; then - AC_MSG_ERROR([Can not find nawk !]) + AC_CHECK_PROG(AWK, gawk, yes, no) + if test "$AWK" = no; then + AC_MSG_ERROR([Can not find nawk !]) + fi fi dnl Checks for sed @@ -804,7 +807,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include #include int flag; void handler(int signal, siginfo_t *siginfo, void *context) -{ flag = ((*siginfo).si_pid == getpid()) ? 0 : -1; }], +{ flag = ((*siginfo).si_pid == getpid()) ? 0 : 1; }], [struct sigaction action; action.sa_sigaction = handler; action.sa_flags = SA_SIGINFO; @@ -922,7 +925,6 @@ case $OS in EXPORT_DYNAMIC=-Wl,-flat_namespace NESTED_FUNCTIONS=-fnested-functions SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES - SEMAPHORES_SYSV=-USEMAPHORES_SYSV IPCS_SYSV=-UIPCS_SYSV CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" ac_configure_args="$ac_configure_args --with-readline=builtin \ @@ -934,7 +936,6 @@ case $OS in EXPORT_DYNAMIC=-Wl,--export-all-symbols NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES - SEMAPHORES_SYSV=-USEMAPHORES_SYSV IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ --disable-shared --enable-static" @@ -945,7 +946,6 @@ case $OS in EXPORT_DYNAMIC=-Wl,--export-all-symbols NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES - SEMAPHORES_SYSV=-USEMAPHORES_SYSV IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ --disable-shared --enable-static" @@ -956,7 +956,6 @@ case $OS in EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES - SEMAPHORES_SYSV=-USEMAPHORES_SYSV IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ --disable-shared --enable-static" @@ -972,7 +971,6 @@ case $OS in NESTED_FUNCTIONS= EXPORT_DYNAMIC=-Zmap SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES - SEMAPHORES_SYSV=-DSEMAPHORES_SYSV IPCS_SYSV=-DIPCS_SYSV ac_configure_args="$ac_configure_args --without-readline \ --without-cairo --disable-shared --enable-static" @@ -986,7 +984,6 @@ case $OS in EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES - SEMAPHORES_SYSV=-USEMAPHORES_SYSV IPCS_SYSV=-DIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ --disable-shared --enable-static" @@ -999,10 +996,8 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES if test $IPCS_SYSV = no; then - SEMAPHORES_SYSV=-USEMAPHORES_SYSV IPCS_SYSV=-UIPCS_SYSV else - SEMAPHORES_SYSV=-DSEMAPHORES_SYSV IPCS_SYSV=-DIPCS_SYSV fi @@ -1017,7 +1012,6 @@ AC_SUBST(C_STANDARD) AC_SUBST(EXPORT_DYNAMIC) AC_SUBST(NESTED_FUNCTIONS) AC_SUBST(SEMAPHORES_NOMMES) -AC_SUBST(SEMAPHORES_SYSV) AC_SUBST(IPCS_SYSV) AC_SUBST(SEMUN) AC_SUBST(IPV6) @@ -1058,6 +1052,7 @@ AC_CONFIG_FILES(scripts/rpllink) AC_CONFIG_FILES(rpltags/Makefile) AC_CONFIG_FILES(rpliconv/Makefile) AC_CONFIG_FILES(rplsums/Makefile) +AC_CONFIG_FILES(rplawk/Makefile) AC_CONFIG_FILES(lapack/lapack/Makefile) AC_CONFIG_FILES(lapack/blas/Makefile) AC_CONFIG_FILES(ptmalloc3/Makefile)