version 1.34, 2010/08/09 13:52:12
|
version 1.36, 2010/08/13 21:02:19
|
Line 471 AC_CHECK_TYPE([union semun], SEMUN=-DUNI
|
Line 471 AC_CHECK_TYPE([union semun], SEMUN=-DUNI
|
#include <sys/sem.h> |
#include <sys/sem.h> |
]]) |
]]) |
|
|
|
dnl Check for IPv6 support |
|
AC_CHECK_TYPE([struct sockaddr_in6], IPV6=-DIPV6, IPV6=-UIPV6, [[ |
|
#include <netinet/in.h> |
|
]]) |
|
|
dnl Do we need to use -ldl? |
dnl Do we need to use -ldl? |
if test "$CYGWIN" != yes; then |
if test "$CYGWIN" != yes; then |
AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl", |
AC_CHECK_LIB(dl, dlopen, LIBS="$LIBS -ldl", |
Line 786 AC_FUNC_VPRINTF
|
Line 791 AC_FUNC_VPRINTF
|
AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \ |
AC_CHECK_FUNCS(ftime getcwd putenv select strcspn strdup \ |
strerror strspn strstr strtod) |
strerror strspn strstr strtod) |
|
|
AC_CONFIG_SUBDIRS(tools/$NCURSES) |
|
AC_CONFIG_SUBDIRS(tools/$READLINE) |
|
AC_CONFIG_SUBDIRS(tools/$GSL) |
|
AC_CONFIG_SUBDIRS(tools/$GPP) |
|
AC_CONFIG_SUBDIRS(tools/$FILE) |
|
AC_CONFIG_SUBDIRS(tools/$ICONV) |
|
AC_CONFIG_SUBDIRS(tools/$SQLITE) |
|
AC_CONFIG_SUBDIRS(tools/$UNITS) |
|
|
|
dnl Check for OpenSSL os/comp |
dnl Check for OpenSSL os/comp |
AC_ARG_WITH(openssl_arch, |
AC_ARG_WITH(openssl_arch, |
[ --with-openssl-arch=ARCH specify os and compiler for openssl (ARCH or list)], |
[ --with-openssl-arch=ARCH specify os and compiler for openssl (ARCH or list)], |
[], [with_openssl_arch=none]) |
[], [with_openssl_arch=none]) |
|
|
if test $(uname) = "OS/2"; then |
if test $(uname) = "OS/2"; then |
(cd tools/$OPENSSL && os2/OS2-EMX.cmd) |
bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd" |
else |
else |
if test "x$with_openssl_arch" = xnone; then |
if test "x$with_openssl_arch" = xnone; then |
(cd tools/$OPENSSL && ./config) |
(cd tools/$OPENSSL && ./config) |
Line 816 else
|
Line 812 else
|
fi |
fi |
fi |
fi |
|
|
|
AC_CONFIG_SUBDIRS(tools/$NCURSES) |
|
AC_CONFIG_SUBDIRS(tools/$READLINE) |
|
AC_CONFIG_SUBDIRS(tools/$GSL) |
|
AC_CONFIG_SUBDIRS(tools/$GPP) |
|
AC_CONFIG_SUBDIRS(tools/$FILE) |
|
AC_CONFIG_SUBDIRS(tools/$ICONV) |
|
AC_CONFIG_SUBDIRS(tools/$SQLITE) |
|
AC_CONFIG_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 | \ |
Line 905 case $OS in
|
Line 910 case $OS in
|
C_STANDARD=-std=gnu99 |
C_STANDARD=-std=gnu99 |
break ;; |
break ;; |
|
|
|
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) |
AIX) |
EXPORT_DYNAMIC=-Wl,--export-dynamic |
EXPORT_DYNAMIC=-Wl,--export-dynamic |
NESTED_FUNCTIONS= |
NESTED_FUNCTIONS= |
Line 918 case $OS in
|
Line 933 case $OS in
|
OS/2) |
OS/2) |
MALLOC= |
MALLOC= |
OS=OS2 |
OS=OS2 |
FINAL_ENCODING=UTF-8 |
FINAL_ENCODING=CP850 |
NESTED_FUNCTIONS= |
NESTED_FUNCTIONS= |
EXPORT_DYNAMIC=-Zmap |
EXPORT_DYNAMIC=-Zmap |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES |
Line 946 AC_SUBST(NESTED_FUNCTIONS)
|
Line 961 AC_SUBST(NESTED_FUNCTIONS)
|
AC_SUBST(SEMAPHORES_NOMMES) |
AC_SUBST(SEMAPHORES_NOMMES) |
AC_SUBST(SEMAPHORES_SYSV) |
AC_SUBST(SEMAPHORES_SYSV) |
AC_SUBST(SEMUN) |
AC_SUBST(SEMUN) |
|
AC_SUBST(IPV6) |
|
|
AC_SUBST(NCURSES) |
AC_SUBST(NCURSES) |
AC_SUBST(READLINE) |
AC_SUBST(READLINE) |