--- rpl/Attic/configure.in 2010/08/09 13:52:12 1.34 +++ rpl/Attic/configure.in 2010/08/22 16:38:34 1.38 @@ -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]]], [ @@ -471,6 +483,12 @@ AC_CHECK_TYPE([union semun], SEMUN=-DUNI #include ]]) +dnl Check for IPv6 support +AC_CHECK_TYPE([struct sockaddr_in6], IPV6=-DIPV6, IPV6=-UIPV6, [[ +#include +#include +]]) + dnl Do we need to use -ldl? if test "$CYGWIN" != yes; then AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl", @@ -780,28 +798,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) @@ -816,6 +841,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 | \ @@ -889,6 +923,7 @@ case $OS in 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" @@ -900,16 +935,29 @@ case $OS in 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 break ;; + Interix) + 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 + break;; + AIX) 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 @@ -917,22 +965,47 @@ case $OS in OS/2) MALLOC= + if test FORCED_FINAL_ENCODING -eq 0; then \ + FINAL_ENCODING=CP850; \ + fi; OS=OS2 - FINAL_ENCODING=UTF-8 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 SEMAPHORES_SYSV=-USEMAPHORES_SYSV + 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 + + if test $IPCS_SYSV = no; then + SEMAPHORES_SYSV=-USEMAPHORES_SYSV + IPCS_SYSV=-UIPCS_SYSV + else + SEMAPHORES_SYSV=-DSEMAPHORES_SYSV + IPCS_SYSV=-DIPCS_SYSV + fi + ac_configure_args="$ac_configure_args --with-readline=builtin \ --disable-shared --enable-static" C_STANDARD=-std=gnu99 @@ -945,7 +1018,10 @@ 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)