version 1.68, 2011/07/22 21:04:37
|
version 1.69, 2011/07/24 15:34:15
|
Line 634 NESTED_FUNCTIONS
|
Line 634 NESTED_FUNCTIONS
|
EXPORT_DYNAMIC |
EXPORT_DYNAMIC |
C_STANDARD |
C_STANDARD |
OS |
OS |
|
HOST |
GNUPLOT_COMPILATION |
GNUPLOT_COMPILATION |
subdirs |
subdirs |
EGREP |
EGREP |
Line 781 ac_user_opts='
|
Line 782 ac_user_opts='
|
enable_option_checking |
enable_option_checking |
enable_dependency_tracking |
enable_dependency_tracking |
with_x |
with_x |
with_32bits |
with_32bits_abi |
with_64bits |
with_64bits_abi |
with_rplcas |
with_rplcas |
enable_optimization |
enable_optimization |
enable_sysv_semaphores |
enable_sysv_semaphores |
Line 819 FC
|
Line 820 FC
|
FCFLAGS |
FCFLAGS |
XMKMF |
XMKMF |
CPP' |
CPP' |
ac_subdirs_all='tools/$NCURSES |
ac_subdirs_all='tools/$GNUPLOT |
|
tools/$NCURSES |
tools/$READLINE |
tools/$READLINE |
tools/$GSL |
tools/$GSL |
tools/$GPP |
tools/$GPP |
tools/$FILE |
tools/$FILE |
tools/$ICONV |
tools/$ICONV |
tools/$SQLITE |
tools/$SQLITE |
tools/$UNITS |
tools/$UNITS' |
tools/$GNUPLOT' |
|
|
|
# Initialize some variables set by options. |
# Initialize some variables set by options. |
ac_init_help= |
ac_init_help= |
Line 3252 GPP=gpp-2.24
|
Line 3253 GPP=gpp-2.24
|
GNUPLOT=gnuplot-4.4.3 |
GNUPLOT=gnuplot-4.4.3 |
FILE=file-5.03 |
FILE=file-5.03 |
ICONV=libiconv-1.13.1 |
ICONV=libiconv-1.13.1 |
SQLITE=sqlite-3.7.6.3 |
SQLITE=sqlite-3.7.7.1 |
OPENSSL=openssl-1.0.0d |
OPENSSL=openssl-1.0.0d |
|
|
GMP=gmp-5.0.1 |
GMP=gmp-5.0.1 |
Line 4589 fi
|
Line 4590 fi
|
|
|
|
|
|
|
if test "$GXX" != yes; then |
if test "$CXX" != "g++"; then |
as_fn_error $? "Cannot find g++! You have to install it." "$LINENO" 5 |
as_fn_error $? "Cannot find g++! You have to install it." "$LINENO" 5 |
fi |
fi |
|
|
|
if test x"$CXX" != x""; then |
|
GCC_VERSION_MAJEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
|
awk -F. '{ printf("%s", $1);}'` |
|
GCC_VERSION_MINEURE=`$CXX -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
|
awk -F. '{ printf("%s", $2);}'` |
|
if test $GCC_VERSION_MAJEURE -ge 5; then |
|
OPTIMISATION_GXX=-O3 |
|
else |
|
if test $GCC_VERSION_MAJEURE -ge 4 -a $GCC_VERSION_MINEURE -ge 4; then |
|
OPTIMISATION_GXX=-O3 |
|
else |
|
if test $GCC_VERSION_MAJEURE -ge 3; then |
|
OPTIMISATION_GXX=-O2 |
|
else |
|
as_fn_error $? "Cannot find decent or recent g++ (g++-4.3 or better)!" "$LINENO" 5 |
|
fi |
|
fi |
|
fi |
|
fi |
|
|
ac_ext=f |
ac_ext=f |
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' |
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' |
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
Line 5876 if test "$ac_x_libraries" != "no"; then
|
Line 5897 if test "$ac_x_libraries" != "no"; then
|
fi |
fi |
|
|
|
|
# Check whether --with-32bits was given. |
# Check whether --with-32bits-abi was given. |
if test "${with_32bits+set}" = set; then : |
if test "${with_32bits_abi+set}" = set; then : |
withval=$with_32bits; |
withval=$with_32bits_abi; |
if test "$with-32bits-abi" = "no"; then |
if test "$with-32bits-abi" = "no"; then |
ABI= |
ABI= |
else |
else |
Line 5894 fi
|
Line 5915 fi
|
|
|
if test x$ABI = x; then |
if test x$ABI = x; then |
|
|
# Check whether --with-64bits was given. |
# Check whether --with-64bits-abi was given. |
if test "${with_64bits+set}" = set; then : |
if test "${with_64bits_abi+set}" = set; then : |
withval=$with_64bits; |
withval=$with_64bits_abi; |
if test "$with-64bits-abi" = "no"; then |
if test "$with-64bits-abi" = "no"; then |
ABI= |
ABI= |
else |
else |
Line 5911 fi
|
Line 5932 fi
|
|
|
fi |
fi |
|
|
|
LDFLAGS="$LDFLAGS $ABI" |
|
|
|
|
# Check whether --with-rplcas was given. |
# Check whether --with-rplcas was given. |
if test "${with_rplcas+set}" = set; then : |
if test "${with_rplcas+set}" = set; then : |
Line 5939 fi
|
Line 5962 fi
|
if test "${enable_optimization+set}" = set; then : |
if test "${enable_optimization+set}" = set; then : |
enableval=$enable_optimization; |
enableval=$enable_optimization; |
if test "$enableval" = "no"; then |
if test "$enableval" = "no"; then |
CFLAGS= |
CFLAGS=$ABI |
FFLAGS= |
FFLAGS=$ABI |
CXXFLAGS= |
CXXFLAGS=$ABI |
FCFLAGS= |
FCFLAGS=$ABI |
else |
else |
CFLAGS="$CFLAGS $enable_optimization" |
CFLAGS="$CFLAGS $ABI $enable_optimization" |
FFLAGS="$FFLAGS $enable_optimization" |
FFLAGS="$FFLAGS $ABI $enable_optimization" |
FCFLAGS="$FCFLAGS $enable_optimization" |
CXXFLAGS="$CXXFLAGS $ABI $enable_optimization" |
|
FCFLAGS="$FCFLAGS $ABI $enable_optimization" |
fi |
fi |
else |
else |
|
|
CFLAGS="$CFLAGS $OPTIMISATION_C" |
CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" |
FFLAGS="$FFLAGS $OPTIMISATION_F" |
FFLAGS="$FFLAGS $ABI $OPTIMISATION_F" |
FCFLAGS="$FCFLAGS $OPTIMISATION_F" |
CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX" |
|
FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F" |
|
|
|
|
fi |
fi |
Line 9195 else
|
Line 9220 else
|
fi |
fi |
fi |
fi |
|
|
|
|
|
|
subdirs="$subdirs tools/$NCURSES" |
|
|
|
subdirs="$subdirs tools/$READLINE" |
|
|
|
subdirs="$subdirs tools/$GSL" |
|
|
|
subdirs="$subdirs tools/$GPP" |
|
|
|
subdirs="$subdirs tools/$FILE" |
|
|
|
subdirs="$subdirs tools/$ICONV" |
|
|
|
subdirs="$subdirs tools/$SQLITE" |
|
|
|
subdirs="$subdirs tools/$UNITS" |
|
|
|
|
|
if test "$MYGNUPLOT" = "yes"; then |
if test "$MYGNUPLOT" = "yes"; then |
if test ! -d "$srcdir"/tools/$GNUPLOT; then |
if test ! -d "$srcdir"/tools/$GNUPLOT; then |
gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ |
gunzip -c "$srcdir"/tools/$GNUPLOT.tar.gz | \ |
(cd "$srcdir/tools" && tar -xf -) |
(cd "$srcdir/tools" && tar -xf -) |
fi |
fi |
subdirs="$subdirs tools/$GNUPLOT" |
|
|
|
|
subdirs="$subdirs tools/$GNUPLOT" |
|
|
GNUPLOT_COMPILATION=$GNUPLOT |
GNUPLOT_COMPILATION=$GNUPLOT |
else |
else |
Line 9228 fi
|
Line 9236 fi
|
|
|
|
|
|
|
|
HOST=$host |
|
|
|
|
case $host_cpu in |
case $host_cpu in |
|
|
i?86) |
i?86) |
Line 9291 case $OS in
|
Line 9302 case $OS in
|
IPCS_SYSV=-UIPCS_SYSV |
IPCS_SYSV=-UIPCS_SYSV |
CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" |
CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
--disable-shared --enable-static --enable-threads" |
--disable-shared --enable-static --enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
break ;; |
break ;; |
|
|
Line 9301 case $OS in
|
Line 9315 case $OS in
|
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
IPCS_SYSV=-UIPCS_SYSV |
IPCS_SYSV=-UIPCS_SYSV |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
--disable-shared --enable-static --enable-threads" |
--disable-shared --enable-static --enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
break ;; |
break ;; |
|
|
Line 9311 case $OS in
|
Line 9328 case $OS in
|
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
IPCS_SYSV=-UIPCS_SYSV |
IPCS_SYSV=-UIPCS_SYSV |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
--disable-shared --enable-static --enable-threads" |
--disable-shared --enable-static --enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
break;; |
break;; |
|
|
Line 9321 case $OS in
|
Line 9341 case $OS in
|
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
IPCS_SYSV=-UIPCS_SYSV |
IPCS_SYSV=-UIPCS_SYSV |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
--disable-shared --enable-static --enable-threads" |
--disable-shared --enable-static --enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
break ;; |
break ;; |
|
|
Line 9336 case $OS in
|
Line 9359 case $OS in
|
IPCS_SYSV=-DIPCS_SYSV |
IPCS_SYSV=-DIPCS_SYSV |
ac_configure_args="$ac_configure_args --without-readline \ |
ac_configure_args="$ac_configure_args --without-readline \ |
--without-cairo --disable-shared --enable-static \ |
--without-cairo --disable-shared --enable-static \ |
--enable-threads" |
--enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD= |
C_STANDARD= |
break;; |
break;; |
|
|
Line 9349 case $OS in
|
Line 9375 case $OS in
|
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
IPCS_SYSV=-DIPCS_SYSV |
IPCS_SYSV=-DIPCS_SYSV |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
--disable-shared --enable-static --enable-threads" |
--disable-shared --enable-static --enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
break;; |
break;; |
|
|
Line 9365 case $OS in
|
Line 9394 case $OS in
|
fi |
fi |
|
|
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
--disable-shared --enable-static --enable-threads" |
--disable-shared --enable-static --enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
MALLOC=-lumem |
MALLOC=-lumem |
break ;; |
break ;; |
Line 9382 case $OS in
|
Line 9414 case $OS in
|
fi |
fi |
|
|
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
--disable-shared --enable-static --enable-threads" |
--disable-shared --enable-static --enable-threads \ |
|
CFLAGS=\"$CFLAGS\" CXXFLAGS=\"$CXXFLAGS\" \ |
|
FFLAGS=\"$FFLAGS\" FCFLAGS=\"$FCFLAGS\" \ |
|
LDFLAGS=\"$LDFLAGS\"" |
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
break ;; |
break ;; |
|
|
Line 9425 esac
|
Line 9460 esac
|
|
|
|
|
|
|
|
|
|
subdirs="$subdirs tools/$NCURSES" |
|
|
|
subdirs="$subdirs tools/$READLINE" |
|
|
|
subdirs="$subdirs tools/$GSL" |
|
|
|
subdirs="$subdirs tools/$GPP" |
|
|
|
subdirs="$subdirs tools/$FILE" |
|
|
|
subdirs="$subdirs tools/$ICONV" |
|
|
|
subdirs="$subdirs tools/$SQLITE" |
|
|
|
subdirs="$subdirs tools/$UNITS" |
|
|
|
|
ac_config_files="$ac_config_files Makefile" |
ac_config_files="$ac_config_files Makefile" |
|
|
ac_config_files="$ac_config_files COPYING" |
ac_config_files="$ac_config_files COPYING" |