--- rpl/Attic/configure.in 2010/08/12 14:14:58 1.35 +++ rpl/Attic/configure.in 2010/09/07 12:54:03 1.41 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.0.18]) +AC_INIT([rpl],[4.0.19]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -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 @@ -126,6 +126,15 @@ fi],[ ] ) +AC_ARG_ENABLE(sysv-semaphores, +[ --enable-sysv-ipcs use SystemV IPC functions [[default=no]]], [ +if test "$enableval" = "no"; then + IPCS_SYSV=no +else + IPCS_SYSV=yes +fi], +IPCS_SYSV=no) + AC_ARG_ENABLE(full-static, [ --enable-full-static build static RPL/2 engine [[default=shared]]], [ if test "$enableval" = "no"; then @@ -140,11 +149,14 @@ AC_ARG_ENABLE(final-encoding, 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" -fi], + FORCED_FINAL_ENCODING=1 +fi], [ +FORCED_FINAL_ENCODING=0 FINAL_ENCODING="\$(shell locale charmap | \ - \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')") + \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"]) AC_ARG_ENABLE(tex, [ --enable-tex provide the TeX support [[default=guessed]]], [ @@ -316,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 @@ -473,6 +488,7 @@ AC_CHECK_TYPE([union semun], SEMUN=-DUNI dnl Check for IPv6 support AC_CHECK_TYPE([struct sockaddr_in6], IPV6=-DIPV6, IPV6=-UIPV6, [[ +#include #include ]]) @@ -785,28 +801,35 @@ AC_CACHE_CHECK([return type of signal ha AC_DEFINE_UNQUOTED([RETSIGTYPE],[$ac_cv_type_signal],[Define as the return type of signal handlers (`int' or `void').]) +dnl Checks for broken siginfo structure +AC_MSG_CHECKING([for broken siginfo->si_pid]) +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; }], +[struct sigaction action; +action.sa_sigaction = handler; +action.sa_flags = SA_SIGINFO; +sigaction(SIGUSR1, &action, NULL); +raise(SIGUSR1); +return(flag);])], +[BROKEN_SIGINFO=-U_BROKEN_SIGINFO; AC_MSG_RESULT(no)], +[BROKEN_SIGINFO=-D_BROKEN_SIGINFO; AC_MSG_RESULT(yes)]) + AC_FUNC_STRCOLL AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \ strerror strspn strstr strtod) -AC_CONFIG_SUBDIRS(tools/$NCURSES) -AC_CONFIG_SUBDIRS(tools/$READLINE) -AC_CONFIG_SUBDIRS(tools/$GSL) -AC_CONFIG_SUBDIRS(tools/$GPP) -AC_CONFIG_SUBDIRS(tools/$FILE) -AC_CONFIG_SUBDIRS(tools/$ICONV) -AC_CONFIG_SUBDIRS(tools/$SQLITE) -AC_CONFIG_SUBDIRS(tools/$UNITS) - dnl Check for OpenSSL os/comp AC_ARG_WITH(openssl_arch, [ --with-openssl-arch=ARCH specify os and compiler for openssl (ARCH or list)], [], [with_openssl_arch=none]) if test $(uname) = "OS/2"; then - (cd tools/$OPENSSL && os2/OS2-EMX.cmd) + bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd" else if test "x$with_openssl_arch" = xnone; then (cd tools/$OPENSSL && ./config) @@ -821,6 +844,15 @@ else fi fi +AC_CONFIG_SUBDIRS(tools/$NCURSES) +AC_CONFIG_SUBDIRS(tools/$READLINE) +AC_CONFIG_SUBDIRS(tools/$GSL) +AC_CONFIG_SUBDIRS(tools/$GPP) +AC_CONFIG_SUBDIRS(tools/$FILE) +AC_CONFIG_SUBDIRS(tools/$ICONV) +AC_CONFIG_SUBDIRS(tools/$SQLITE) +AC_CONFIG_SUBDIRS(tools/$UNITS) + if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ @@ -893,7 +925,7 @@ 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 \ --disable-shared --enable-static" @@ -904,7 +936,7 @@ 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" C_STANDARD=-std=gnu99 @@ -914,7 +946,7 @@ 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" C_STANDARD=-std=gnu99 @@ -924,7 +956,7 @@ 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" C_STANDARD=-std=gnu99 @@ -932,22 +964,43 @@ case $OS in OS/2) MALLOC= + if test $FORCED_FINAL_ENCODING -eq 0; then \ + FINAL_ENCODING=CP850; \ + fi; OS=OS2 - FINAL_ENCODING=CP850 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" 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 + IPCS_SYSV=-DIPCS_SYSV + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 + break;; + *) EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES - SEMAPHORES_SYSV=-USEMAPHORES_SYSV + + if test $IPCS_SYSV = no; then + IPCS_SYSV=-UIPCS_SYSV + else + IPCS_SYSV=-DIPCS_SYSV + fi + ac_configure_args="$ac_configure_args --with-readline=builtin \ --disable-shared --enable-static" C_STANDARD=-std=gnu99 @@ -959,9 +1012,10 @@ 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) +AC_SUBST(BROKEN_SIGINFO) AC_SUBST(NCURSES) AC_SUBST(READLINE) @@ -998,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)