--- rpl/Attic/configure.in 2010/07/31 10:34:15 1.31 +++ rpl/Attic/configure.in 2010/08/13 21:02:19 1.36 @@ -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 +SQLITE=sqlite-3.7.0.1 OPENSSL=openssl-1.0.0a dnl Checks for C compiler @@ -260,6 +260,12 @@ fi if test ! -d "$srcdir"/tools/$GSL; then gunzip -c "$srcdir"/tools/$GSL.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) + if test $(uname) = "OS/2"; then + (cd "$srcdir"/tools/$GSL; \ + TMP=$(mktemp tmp.XXXXXXXXXX); \ + sed -e '1,$s/\${1+"\$@"}/"\$@"/g' ltmain.sh > $TMP; \ + \mv -f $TMP ltmain.sh) + fi fi if test ! -d "$srcdir"/tools/$GPP; then gunzip -c "$srcdir"/tools/$GPP.tar.gz | \ @@ -277,6 +283,7 @@ fi if test ! -d "$srcdir"/tools/$SQLITE; then gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) + (cd "$srcdir/tools"/$SQLITE && gunzip -c ../$SQLITE.diff.gz | patch -p1) fi if test ! -d tools/$OPENSSL; then gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ @@ -459,6 +466,16 @@ dnl Checks for libraries AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can not find libm !])) AC_CHECK_LIB(pthread, main,, AC_MSG_ERROR([Can not find libpthread !])) +dnl Check for union semun +AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[ +#include +]]) + +dnl Check for IPv6 support +AC_CHECK_TYPE([struct sockaddr_in6], IPV6=-DIPV6, IPV6=-UIPV6, [[ +#include +]]) + dnl Do we need to use -ldl? if test "$CYGWIN" != yes; then AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl", @@ -774,7 +791,26 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \ strerror strspn strstr strtod) -ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared --enable-static" +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 + bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd" +else + if test "x$with_openssl_arch" = xnone; then + (cd tools/$OPENSSL && ./config) + elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then + (cd tools/$OPENSSL && ./Configure) + AC_MSG_ERROR([OS/COMP informations are required!]) + elif test "x$with_openssl_arch" = xlist; then + (cd tools/$OPENSSL && ./Configure) + AC_MSG_ERROR([Please specify OS and Architecture]) + else + (cd tools/$OPENSSL && ./Configure $with_openssl_arch) + fi +fi AC_CONFIG_SUBDIRS(tools/$NCURSES) AC_CONFIG_SUBDIRS(tools/$READLINE) @@ -785,23 +821,6 @@ 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 "x$with_openssl_arch" = xnone; then - (cd tools/$OPENSSL && ./config) -elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then - (cd tools/$OPENSSL && ./Configure) - AC_MSG_ERROR([OS/COMP informations are required!]) -elif test "x$with_openssl_arch" = xlist; then - (cd tools/$OPENSSL && ./Configure) - AC_MSG_ERROR([Please specify OS and Architecture]) -else - (cd tools/$OPENSSL && ./Configure $with_openssl_arch) -fi - if test "$MYGNUPLOT" = "yes"; then if test ! -d "$srcdir"/tools/$GNUPLOT; then gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ @@ -871,35 +890,78 @@ DATE=$(env LC_ALL=C date +'%A %x, %X %Z' case $OS in Darwin) - EXPORT_DYNAMIC=-flat_namespace + EXPORT_DYNAMIC=-Wl,-flat_namespace NESTED_FUNCTIONS=-fnested-functions SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; - Cygwin) - EXPORT_DYNAMIC=--export-all-symbols + Cygwin) + EXPORT_DYNAMIC=-Wl,--export-all-symbols NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; - AIX) - EXPORT_DYNAMIC=--export-dynamic + Interix) + EXPORT_DYNAMIC=-Wl,--export-all-symbols + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_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 + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; + OS/2) + MALLOC= + OS=OS2 + FINAL_ENCODING=CP850 + NESTED_FUNCTIONS= + EXPORT_DYNAMIC=-Zmap + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-DSEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --without-readline \ + --without-cairo --disable-shared --enable-static" + C_STANDARD= + break;; + *) - EXPORT_DYNAMIC=--export-dynamic + EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + SEMAPHORES_SYSV=-USEMAPHORES_SYSV + ac_configure_args="$ac_configure_args --with-readline=builtin \ + --disable-shared --enable-static" + C_STANDARD=-std=gnu99 break ;; esac +AC_SUBST(C_STANDARD) AC_SUBST(EXPORT_DYNAMIC) AC_SUBST(NESTED_FUNCTIONS) AC_SUBST(SEMAPHORES_NOMMES) +AC_SUBST(SEMAPHORES_SYSV) +AC_SUBST(SEMUN) +AC_SUBST(IPV6) AC_SUBST(NCURSES) AC_SUBST(READLINE)