automake 64bit

This commit is contained in:
Joachim Schoeberl 2009-08-24 22:51:13 +00:00
parent c0c0816fc7
commit a7d92de0ef

View File

@ -19,6 +19,18 @@ TEA_LOAD_TKCONFIG
TEA_PUBLIC_TCL_HEADERS
# AC_HEADER_STDC
AC_CONFIG_HEADERS(config.h)
AC_DISABLE_STATIC
AC_LANG([C++])
AC_PROG_CXX
AC_PROG_LIBTOOL
LT_INIT
# OpenCASCADE configuration
AC_ARG_ENABLE([occ],
@ -33,6 +45,7 @@ AC_ARG_WITH([occ],
)
if test a$occon = atrue ; then
AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc"])
@ -40,7 +53,6 @@ if test a$occon = atrue ; then
# -lTKDCAF
if test a$build_cpu = ax86_64 ; then
AC_SUBST([OCCFLAGS],["$OCCFLAGS -D_OCC64"])
fi
@ -106,15 +118,6 @@ AC_ARG_ENABLE([ffmpeg],
]
)
# AC_HEADER_STDC
AC_CONFIG_HEADERS(config.h)
AC_DISABLE_STATIC
AC_LANG([C++])
AC_PROG_CXX
AC_PROG_LIBTOOL
LT_INIT
AM_CONDITIONAL([NGLIB], [test x$nglibon = xtrue])
@ -128,7 +131,6 @@ AC_CHECK_LIB(pthread, pthread_create)
#--------------------------------------------------------------------
# __CHANGE__
# Choose OpenGL platform (borrowed from Togl1.7)
@ -162,14 +164,15 @@ esac
AC_SUBST(LIBGLU)
AC_CHECK_FUNCS([pow])
AC_CHECK_FUNCS([floor])
AC_CHECK_HEADERS([limits.h])
AC_CONFIG_FILES(Makefile libsrc/Makefile libsrc/csg/Makefile
libsrc/general/Makefile libsrc/geom2d/Makefile libsrc/gprim/Makefile
libsrc/include/Makefile libsrc/interface/Makefile
@ -178,4 +181,7 @@ libsrc/linalg/Makefile libsrc/meshing/Makefile libsrc/occ/Makefile
libsrc/visualization/Makefile ng/Makefile nglib/Makefile
tutorials/Makefile doc/Makefile windows/Makefile )
AC_OUTPUT