--- rpl/Attic/configure 2010/12/14 15:46:23 1.48 +++ rpl/Attic/configure 2011/02/18 09:50:16 1.50 @@ -596,6 +596,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +MALLOC EXT_SQL DATE_FR FINAL_ENCODING @@ -3221,15 +3222,15 @@ ac_config_headers="$ac_config_headers rp NCURSES=ncurses-5.7-20101204 -READLINE=readline-6.1 +READLINE=readline-6.2 UNITS=units-1.88 GSL=gsl-1.14 GPP=gpp-2.24 GNUPLOT=gnuplot-4.4.2 FILE=file-5.03 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.4 -OPENSSL=openssl-1.0.0c +SQLITE=sqlite-3.7.5 +OPENSSL=openssl-1.0.0d ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6119,7 +6120,6 @@ 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 | \ @@ -9159,6 +9159,7 @@ esac DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z') DATE=$(env LC_ALL=C date +'%A %x, %X %Z') +MALLOC= case $OS in @@ -9169,7 +9170,7 @@ case $OS in IPCS_SYSV=-UIPCS_SYSV CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static" + --disable-shared --enable-static --enable-threads" C_STANDARD=-std=gnu99 break ;; @@ -9179,7 +9180,7 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static" + --disable-shared --enable-static --enable-threads" C_STANDARD=-std=gnu99 break ;; @@ -9189,7 +9190,7 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static" + --disable-shared --enable-static --enable-threads" C_STANDARD=-std=gnu99 break;; @@ -9199,7 +9200,7 @@ case $OS in SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES IPCS_SYSV=-UIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static" + --disable-shared --enable-static --enable-threads" C_STANDARD=-std=gnu99 break ;; @@ -9213,7 +9214,8 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES IPCS_SYSV=-DIPCS_SYSV ac_configure_args="$ac_configure_args --without-readline \ - --without-cairo --disable-shared --enable-static" + --without-cairo --disable-shared --enable-static \ + --enable-threads" C_STANDARD= break;; @@ -9226,10 +9228,27 @@ case $OS in SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES IPCS_SYSV=-DIPCS_SYSV ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static" + --disable-shared --enable-static --enable-threads" C_STANDARD=-std=gnu99 break;; + SunOS) + EXPORT_DYNAMIC=-Wl,--export-dynamic + NESTED_FUNCTIONS= + SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES + + 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 --enable-threads" + C_STANDARD=-std=gnu99 + MALLOC=-lumem + break ;; + *) EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= @@ -9242,7 +9261,7 @@ case $OS in fi ac_configure_args="$ac_configure_args --with-readline=builtin \ - --disable-shared --enable-static" + --disable-shared --enable-static --enable-threads" C_STANDARD=-std=gnu99 break ;; @@ -9250,6 +9269,7 @@ esac +