version 1.29, 2010/07/25 18:15:37
|
version 1.32, 2010/08/06 15:32:16
|
Line 596 ac_subst_vars='am__EXEEXT_FALSE
|
Line 596 ac_subst_vars='am__EXEEXT_FALSE
|
am__EXEEXT_TRUE |
am__EXEEXT_TRUE |
LTLIBOBJS |
LTLIBOBJS |
LIBOBJS |
LIBOBJS |
|
EXT_SQL |
MALLOC |
MALLOC |
DATE_FR |
DATE_FR |
FINAL_ENCODING |
FINAL_ENCODING |
Line 758 enable_option_checking
|
Line 759 enable_option_checking
|
enable_dependency_tracking |
enable_dependency_tracking |
with_x |
with_x |
enable_optimization |
enable_optimization |
|
enable_full_static |
enable_final_encoding |
enable_final_encoding |
enable_tex |
enable_tex |
enable_vim |
enable_vim |
Line 1424 Optional Features:
|
Line 1426 Optional Features:
|
--disable-dependency-tracking speeds up one-time build |
--disable-dependency-tracking speeds up one-time build |
--enable-dependency-tracking do not reject slow dependency extractors |
--enable-dependency-tracking do not reject slow dependency extractors |
--enable-optimization set compiler flags [default=environment variables -O3] |
--enable-optimization set compiler flags [default=environment variables -O3] |
|
--enable-full-static build static RPL/2 engine [default=shared] |
--enable-final-encoding force final encoding [default=guessed] |
--enable-final-encoding force final encoding [default=guessed] |
--enable-tex provide the TeX support [default=guessed] |
--enable-tex provide the TeX support [default=guessed] |
--enable-vim provide the vim support [default=guessed] |
--enable-vim provide the vim support [default=guessed] |
Line 3202 ac_config_headers="$ac_config_headers rp
|
Line 3205 ac_config_headers="$ac_config_headers rp
|
|
|
NCURSES=ncurses-5.7-20100619 |
NCURSES=ncurses-5.7-20100619 |
READLINE=readline-6.1 |
READLINE=readline-6.1 |
UNITS=units-1.87 |
UNITS=units-1.88 |
GSL=gsl-1.14 |
GSL=gsl-1.14 |
GPP=gpp-2.24 |
GPP=gpp-2.24 |
GNUPLOT=gnuplot-4.4.0 |
GNUPLOT=gnuplot-4.4.0 |
FILE=file-5.03 |
FILE=file-5.03 |
ICONV=libiconv-1.13.1 |
ICONV=libiconv-1.13.1 |
SQLITE=sqlite-3.6.23.1 |
SQLITE=sqlite-3.7.0.1 |
OPENSSL=openssl-1.0.0a |
OPENSSL=openssl-1.0.0a |
|
|
ac_ext=c |
ac_ext=c |
Line 4000 fi
|
Line 4003 fi
|
|
|
|
|
|
|
|
EXT_SQL= |
|
|
if test x"$CC" != x""; then |
if test x"$CC" != x""; then |
GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
GCC_VERSION_MAJEURE=`$CC -v 2>&1 | awk '/^gcc/ { print $3; }' | \ |
awk -F. '{ printf("%s", $1);}'` |
awk -F. '{ printf("%s", $1);}'` |
Line 5846 else
|
Line 5851 else
|
fi |
fi |
|
|
|
|
|
# Check whether --enable-full-static was given. |
|
if test "${enable_full_static+set}" = set; then : |
|
enableval=$enable_full_static; |
|
if test "$enableval" = "no"; then |
|
STATIC=no |
|
else |
|
STATIC=yes |
|
fi |
|
else |
|
STATIC=no |
|
fi |
|
|
|
|
# Check whether --enable-final-encoding was given. |
# Check whether --enable-final-encoding was given. |
if test "${enable_final_encoding+set}" = set; then : |
if test "${enable_final_encoding+set}" = set; then : |
enableval=$enable_final_encoding; |
enableval=$enable_final_encoding; |
Line 6065 fi
|
Line 6083 fi
|
if test ! -d "$srcdir"/tools/$SQLITE; then |
if test ! -d "$srcdir"/tools/$SQLITE; then |
gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ |
gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ |
(cd "$srcdir/tools" && tar -xf -) |
(cd "$srcdir/tools" && tar -xf -) |
|
(cd "$srcdir/tools"/$SQLITE && gunzip -c ../$SQLITE.diff.gz | patch -p1) |
fi |
fi |
if test ! -d tools/$OPENSSL; then |
if test ! -d tools/$OPENSSL; then |
gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ |
gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ |
Line 7030 fi
|
Line 7049 fi
|
|
|
if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then |
if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then |
libMySQLinc="-I/usr/include" |
libMySQLinc="-I/usr/include" |
libMySQLlib="-L/usr/lib" |
libMySQLlib="/usr/lib" |
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in /usr/include" >&5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in /usr/include" >&5 |
$as_echo_n "checking for libmysql includes in /usr/include... " >&6; } |
$as_echo_n "checking for libmysql includes in /usr/include... " >&6; } |
saved_CFLAGS="$CFLAGS" |
saved_CFLAGS="$CFLAGS" |
CFLAGS="$CFLAGS $libMySQLinc" |
CFLAGS="$CFLAGS -L/$libMySQLinc" |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
/* end confdefs.h. */ |
/* end confdefs.h. */ |
#include "mysql.h" |
#include "mysql.h" |
Line 7149 rm -f core conftest.err conftest.$ac_obj
|
Line 7168 rm -f core conftest.err conftest.$ac_obj
|
else |
else |
if test "x$with_mysql" != xno; then |
if test "x$with_mysql" != xno; then |
libMySQLinc="-I$with_mysql/include" |
libMySQLinc="-I$with_mysql/include" |
libMySQLlib="-L$with_mysql/lib" |
libMySQLlib="$with_mysql/lib" |
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in $with_mysql" >&5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql includes in $with_mysql" >&5 |
$as_echo_n "checking for libmysql includes in $with_mysql... " >&6; } |
$as_echo_n "checking for libmysql includes in $with_mysql... " >&6; } |
Line 7217 if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
|
Line 7236 if test "$MYSQL_SUPPORT" = "-DMYSQL_SUPP
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql libraries in $libMySQLlib" >&5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmysql libraries in $libMySQLlib" >&5 |
$as_echo_n "checking for libmysql libraries in $libMySQLlib... " >&6; } |
$as_echo_n "checking for libmysql libraries in $libMySQLlib... " >&6; } |
saved_LIBS="$LIBS" |
saved_LIBS="$LIBS" |
LIBS="$LIBS $libMySQLlib $libMySQLinc -lmysqlclient_r" |
if test $STATIC = no; then |
|
LIBS="$LIBS -L/$libMySQLlib -lmysqlclient_r $libMySQLinc" |
|
else |
|
LIBS="$LIBS $libMySQLlib/libmysqlclient_r.a -lz $libMySQLinc" |
|
fi |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
/* end confdefs.h. */ |
/* end confdefs.h. */ |
#include "mysql.h" |
#include "mysql.h" |
Line 7239 fi
|
Line 7262 fi
|
rm -f core conftest.err conftest.$ac_objext \ |
rm -f core conftest.err conftest.$ac_objext \ |
conftest$ac_exeext conftest.$ac_ext |
conftest$ac_exeext conftest.$ac_ext |
LIBS=$saved_LIBS; |
LIBS=$saved_LIBS; |
libMySQLlib="$libMySQLlib -lmysqlclient_r" |
if test $STATIC = no; then |
|
libMySQLlib="-L/$libMySQLlib -lmysqlclient_r" |
|
else |
|
libMySQLlib="$libMySQLlib/libmysqlclient_r.a" |
|
EXT_SQL="$EXT_SQL $libMySQLlib" |
|
fi |
fi |
fi |
|
|
if test $MYSQL_LIB = no; then |
if test $MYSQL_LIB = no; then |
Line 7271 fi
|
Line 7299 fi
|
|
|
if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then |
if test "x$with_postgresql" = xcheck -o "x$with_postgresql" = xyes; then |
libPgSQLinc="-I/usr/include" |
libPgSQLinc="-I/usr/include" |
libPgSQLlib="-L/usr/lib" |
libPgSQLlib="/usr/lib" |
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in /usr/include" >&5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in /usr/include" >&5 |
$as_echo_n "checking for libpq includes in /usr/include... " >&6; } |
$as_echo_n "checking for libpq includes in /usr/include... " >&6; } |
Line 7453 rm -f core conftest.err conftest.$ac_obj
|
Line 7481 rm -f core conftest.err conftest.$ac_obj
|
else |
else |
if test "x$with_postgresql" != xno; then |
if test "x$with_postgresql" != xno; then |
libPgSQLinc="-I$with_postgresql/include" |
libPgSQLinc="-I$with_postgresql/include" |
libPgSQLlib="-L$with_postgresql/lib" |
libPgSQLlib="$with_postgresql/lib" |
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in $libPgSQLinc" >&5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq includes in $libPgSQLinc" >&5 |
$as_echo_n "checking for libpq includes in $libPgSQLinc... " >&6; } |
$as_echo_n "checking for libpq includes in $libPgSQLinc... " >&6; } |
Line 7553 if test "$POSTGRESQL_SUPPORT" = "-DPOSTG
|
Line 7581 if test "$POSTGRESQL_SUPPORT" = "-DPOSTG
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq libraries in $libPgSQLlib" >&5 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpq libraries in $libPgSQLlib" >&5 |
$as_echo_n "checking for libpq libraries in $libPgSQLlib... " >&6; } |
$as_echo_n "checking for libpq libraries in $libPgSQLlib... " >&6; } |
saved_LIBS="$LIBS" |
saved_LIBS="$LIBS" |
LIBS="$LIBS $libPgSQLlib $libPgSQLinc -lpq" |
if test $STATIC = no; then |
|
LIBS="$LIBS -L/$libPgSQLlib $libPgSQLinc -lpq" |
|
else |
|
LIBS="$LIBS $libPgSQLlib/libpq.a $libPgSQLinc" |
|
fi |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
/* end confdefs.h. */ |
/* end confdefs.h. */ |
#include "libpq-fe.h" |
#include "libpq-fe.h" |
Line 7576 fi
|
Line 7608 fi
|
rm -f core conftest.err conftest.$ac_objext \ |
rm -f core conftest.err conftest.$ac_objext \ |
conftest$ac_exeext conftest.$ac_ext |
conftest$ac_exeext conftest.$ac_ext |
LIBS=$saved_LIBS; |
LIBS=$saved_LIBS; |
libPgSQLlib="$libPgSQLlib -lpq" |
if test $STATIC = no; then |
|
libPgSQLlib="-L/$libPgSQLlib -lpq" |
|
else |
|
libPgSQLlib="$libPgSQLlib/libpq.a" |
|
EXT_SQL="$EXT_SQL $libPgSQLlib" |
|
fi |
fi |
fi |
fi |
fi |
|
|
Line 8849 fi
|
Line 8886 fi
|
done |
done |
|
|
|
|
ac_configure_args="$ac_configure_args --with-readline=builtin --disable-shared --enable-static" |
|
|
|
|
|
|
|
subdirs="$subdirs tools/$NCURSES" |
subdirs="$subdirs tools/$NCURSES" |
Line 8879 else
|
Line 8914 else
|
fi |
fi |
|
|
|
|
if test "x$with_openssl_arch" = xnone; then |
if test $(uname) = "OS/2"; then |
(cd tools/$OPENSSL && ./config) |
(cd tools/$OPENSSL && os2/OS2-EMX.cmd) |
elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then |
|
(cd tools/$OPENSSL && ./Configure) |
|
as_fn_error "OS/COMP informations are required!" "$LINENO" 5 |
|
elif test "x$with_openssl_arch" = xlist; then |
|
(cd tools/$OPENSSL && ./Configure) |
|
as_fn_error "Please specify OS and Architecture" "$LINENO" 5 |
|
else |
else |
(cd tools/$OPENSSL && ./Configure $with_openssl_arch) |
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) |
|
as_fn_error "OS/COMP informations are required!" "$LINENO" 5 |
|
elif test "x$with_openssl_arch" = xlist; then |
|
(cd tools/$OPENSSL && ./Configure) |
|
as_fn_error "Please specify OS and Architecture" "$LINENO" 5 |
|
else |
|
(cd tools/$OPENSSL && ./Configure $with_openssl_arch) |
|
fi |
fi |
fi |
|
|
if test "$MYGNUPLOT" = "yes"; then |
if test "$MYGNUPLOT" = "yes"; then |
Line 8961 DATE=$(env LC_ALL=C date +'%A %x, %X %Z'
|
Line 9000 DATE=$(env LC_ALL=C date +'%A %x, %X %Z'
|
case $OS in |
case $OS in |
|
|
Darwin) |
Darwin) |
EXPORT_DYNAMIC=-flat_namespace |
EXPORT_DYNAMIC=-Wl,-flat_namespace |
NESTED_FUNCTIONS=-fnested-functions |
NESTED_FUNCTIONS=-fnested-functions |
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" |
CXXFLAGS="$CXXFLAGS -D_GLIBCXX_FULLY_DYNAMIC_STRING" |
|
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
|
--disable-shared --enable-static" |
break ;; |
break ;; |
|
|
Cygwin) |
Cygwin) |
EXPORT_DYNAMIC=--export-all-symbols |
EXPORT_DYNAMIC=-Wl,--export-all-symbols |
NESTED_FUNCTIONS= |
NESTED_FUNCTIONS= |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
|
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
|
--disable-shared --enable-static" |
break ;; |
break ;; |
|
|
AIX) |
AIX) |
EXPORT_DYNAMIC=--export-dynamic |
EXPORT_DYNAMIC=-Wl,--export-dynamic |
NESTED_FUNCTIONS= |
NESTED_FUNCTIONS= |
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES |
|
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
|
--disable-shared --enable-static" |
break ;; |
break ;; |
|
|
|
OS/2) |
|
MALLOC= |
|
OS=OS2 |
|
FINAL_ENCODING=UTF-8 |
|
NESTED_FUNCTIONS= |
|
EXPORT_DYNAMIC=-Zmap |
|
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
|
ac_configure_args="$ac_configure_args --without-readline \ |
|
--without-cairo --disable-shared --enable-static" |
|
break;; |
|
|
*) |
*) |
EXPORT_DYNAMIC=--export-dynamic |
EXPORT_DYNAMIC=-Wl,--export-dynamic |
NESTED_FUNCTIONS= |
NESTED_FUNCTIONS= |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
|
ac_configure_args="$ac_configure_args --with-readline=builtin \ |
|
--disable-shared --enable-static" |
break ;; |
break ;; |
|
|
esac |
esac |
|
|
|
|
|
|
|
|
|
|
|
|
|
|