--- rpl/Attic/configure.in 2010/08/15 14:46:23 1.37 +++ rpl/Attic/configure.in 2010/08/26 19:07:33 1.40 @@ -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 @@ -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 @@ -914,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" @@ -925,6 +935,7 @@ 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 @@ -935,6 +946,7 @@ 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 @@ -945,6 +957,7 @@ case $OS in 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 @@ -952,7 +965,7 @@ case $OS in OS/2) MALLOC= - if test FORCED_FINAL_ENCODING -eq 0; then \ + if test $FORCED_FINAL_ENCODING -eq 0; then \ FINAL_ENCODING=CP850; \ fi; OS=OS2 @@ -960,19 +973,21 @@ case $OS in 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 \ + 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 @@ -982,7 +997,15 @@ case $OS in EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES - SEMAPHORES_SYSV=-USEMAPHORES_SYSV + + 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 @@ -995,6 +1018,7 @@ 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)