Menu
▾
▴
[Ecell-cvs] SF.net SVN: ecell:[3192] ecell3/branches/ecell-3.1
|
From: <mor...@us...> - 2008-10-11 07:35:26
|
Revision: 3192
http://ecell.svn.sourceforge.net/ecell/?rev=3192&view=rev
Author: moriyoshi
Date: 2008-10-11 07:35:21 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
* Specify ``make dist'' options because of such exsessive length of pathnames in the archive that cannot be held in the ancient TAR format.
* The reason the templates of configure.ac are required is that synthesized version numbers are not allowed in newer autoconf / automake convention.
Modified Paths:
--------------
ecell3/branches/ecell-3.1/autogen.sh
ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in
ecell3/branches/ecell-3.1/ecell_version.sh
Added Paths:
-----------
ecell3/branches/ecell-3.1/configure.ac.in
ecell3/branches/ecell-3.1/ecell/configure.ac.in
Removed Paths:
-------------
ecell3/branches/ecell-3.1/configure.in
ecell3/branches/ecell-3.1/ecell/configure.in
Property Changed:
----------------
ecell3/branches/ecell-3.1/
ecell3/branches/ecell-3.1/ecell/
Property changes on: ecell3/branches/ecell-3.1
___________________________________________________________________
Modified: svn:ignore
- *.tar.bz2
*.tar.gz
*~
Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h.in
config.log
config.status
config.sub
configure
depcomp
ecell3.doxy
ecell3_config.h
ecell3_config.h.in
install
install-sh
libtool
libtool.cfg
ltmain.sh
missing
py-compile
stamp-h1
+ *.tar.bz2
*.tar.gz
*~
Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h.in
config.log
config.status
config.sub
configure
configure.ac
depcomp
ecell3.doxy
ecell3_config.h
ecell3_config.h.in
install
install-sh
libtool
libtool.cfg
ltmain.sh
missing
py-compile
stamp-h1
Modified: ecell3/branches/ecell-3.1/autogen.sh
===================================================================
--- ecell3/branches/ecell-3.1/autogen.sh 2008-10-11 07:27:47 UTC (rev 3191)
+++ ecell3/branches/ecell-3.1/autogen.sh 2008-10-11 07:35:21 UTC (rev 3192)
@@ -39,10 +39,13 @@
[ ! -e doc/users-manual/users-manual ] && mkdir -p doc/users-manual/users-manual
+. ./ecell_version.sh
+
for dir in . libltdl dmtool ecell
do
echo -n "Running autotools for $dir ... "
(cd $dir; \
+ { if [ -r configure.ac.in ]; then echo -n 'configure.ac ' && sed -e "s/@ECELL_VERSION_NUMBER@/$ECELL_VERSION_NUMBER/g" configure.ac.in > configure.ac; fi } && \
{ echo -n 'libtoolize '; $LIBTOOLIZE -c --force --automake; } && \
{ echo -n 'aclocal '; aclocal; } && \
{ echo -n 'autoheader '; autoheader -f ; } && \
Copied: ecell3/branches/ecell-3.1/configure.ac.in (from rev 3168, ecell3/branches/ecell-3.1/configure.in)
===================================================================
--- ecell3/branches/ecell-3.1/configure.ac.in (rev 0)
+++ ecell3/branches/ecell-3.1/configure.ac.in 2008-10-11 07:35:21 UTC (rev 3192)
@@ -0,0 +1,68 @@
+AC_REVISION([$Id$])
+AC_INIT([ecell], [@ECELL_VERSION_NUMBER@])
+AC_CONFIG_SRCDIR([autogen.sh])
+
+AC_CANONICAL_TARGET([])
+AM_INIT_AUTOMAKE([filename-length-max=255 tar-ustar dist-bzip2])
+AC_PROG_MAKE_SET
+
+AC_LIBLTDL_CONVENIENCE
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+
+AC_CONFIG_SUBDIRS([libltdl dmtool ecell])
+
+AC_ARG_ENABLE([gui],
+ AC_HELP_STRING([--disable-gui],
+ [build ecell without gui frontends.]), [],
+ [enable_gui=yes]
+)
+AC_ARG_WITH([numpy-includes],
+ AC_HELP_STRING([--with-numpy-includes=DIR],
+ [specify the numpy header location]),,)
+
+AC_ARG_ENABLE([compiler-extensions],
+ AC_HELP_STRING([--disable-compiler-extensions],
+ [Don't exploit the compiler's special language syntax and optimizations that are not part of the standard (such as ISO C++).]))
+
+AM_CONFIG_HEADER(ecell3_config.h)
+
+AC_CHECK_TOOL([DB2HTML], [db2html])
+AC_CHECK_TOOL([DB2PDF], [db2pdf])
+AC_CHECK_TOOL([DB2PS], [db2ps])
+AC_CHECK_TOOL([DB2DVI], [db2dvi])
+AC_CHECK_TOOL([DOXYGEN], [doxygen])
+AC_CHECK_TOOL([DOT], [dot])
+
+HAVE_DOT="no"
+if test ! -z "$DOT"; then
+ HAVE_DOT="yes"
+fi
+AC_SUBST([HAVE_DOT])
+
+AM_CONDITIONAL([BUILD_USERS_MANUAL_html], [test ! -z "$DB2HTML"])
+AM_CONDITIONAL([BUILD_USERS_MANUAL_pdf], [test ! -z "$DB2PDF"])
+AM_CONDITIONAL([BUILD_USERS_MANUAL_ps], [test ! -z "$DB2PS"])
+AM_CONDITIONAL([BUILD_USERS_MANUAL_dvi], [test ! -z "$DB2DVI"])
+AM_CONDITIONAL([BUILD_API_REF_html], [test ! -z "$DOXYGEN"])
+
+dnl
+dnl Create the top-level Makefile.
+dnl
+AC_CONFIG_FILES([
+Makefile
+doc/Makefile
+doc/samples/Makefile
+doc/users-manual/Makefile
+osdep/Makefile
+osdep/win32/Makefile
+build/Makefile
+build/msvc/Makefile
+build/msvc/dm/Makefile
+doc/ecell3.doxy
+doc/users-manual/info.ent
+])
+dnl
+AC_OUTPUT
Property changes on: ecell3/branches/ecell-3.1/configure.ac.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: ecell3/branches/ecell-3.1/configure.in
===================================================================
--- ecell3/branches/ecell-3.1/configure.in 2008-10-11 07:27:47 UTC (rev 3191)
+++ ecell3/branches/ecell-3.1/configure.in 2008-10-11 07:35:21 UTC (rev 3192)
@@ -1,75 +0,0 @@
-AC_REVISION([$Id$])
-AC_INIT
-AC_CONFIG_SRCDIR([autogen.sh])
-
-dnl
-sinclude([./ecell_version.sh])
-
-dnl AC_CONFIG_AUX_DIR()
-
-AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE([ecell],${ECELL_VERSION_NUMBER})
-AC_PROG_MAKE_SET
-
-dnl AC_LIBLTDL_INSTALLABLE
-
-AC_LIBLTDL_CONVENIENCE
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
-AC_CONFIG_SUBDIRS([libltdl dmtool ecell])
-
-AC_ARG_ENABLE([gui],
- AC_HELP_STRING([--disable-gui],
- [build ecell without gui frontends.]), [],
- [enable_gui=yes]
-)
-AC_ARG_WITH([numpy-includes],
- AC_HELP_STRING([--with-numpy-includes=DIR],
- [specify the numpy header location]),,)
-
-AC_ARG_ENABLE([compiler-extensions],
- AC_HELP_STRING([--disable-compiler-extensions],
- [Don't exploit the compiler's special language syntax and optimizations that are not part of the standard (such as ISO C++).]))
-
-AM_CONFIG_HEADER(ecell3_config.h)
-
-AC_CHECK_TOOL([DB2HTML], [db2html])
-AC_CHECK_TOOL([DB2PDF], [db2pdf])
-AC_CHECK_TOOL([DB2PS], [db2ps])
-AC_CHECK_TOOL([DB2DVI], [db2dvi])
-AC_CHECK_TOOL([DOXYGEN], [doxygen])
-AC_CHECK_TOOL([DOT], [dot])
-
-HAVE_DOT="no"
-if test ! -z "$DOT"; then
- HAVE_DOT="yes"
-fi
-AC_SUBST([HAVE_DOT])
-
-AM_CONDITIONAL([BUILD_USERS_MANUAL_html], [test ! -z "$DB2HTML"])
-AM_CONDITIONAL([BUILD_USERS_MANUAL_pdf], [test ! -z "$DB2PDF"])
-AM_CONDITIONAL([BUILD_USERS_MANUAL_ps], [test ! -z "$DB2PS"])
-AM_CONDITIONAL([BUILD_USERS_MANUAL_dvi], [test ! -z "$DB2DVI"])
-AM_CONDITIONAL([BUILD_API_REF_html], [test ! -z "$DOXYGEN"])
-
-dnl
-dnl Create the top-level Makefile.
-dnl
-AC_CONFIG_FILES([
-Makefile
-doc/Makefile
-doc/samples/Makefile
-doc/users-manual/Makefile
-osdep/Makefile
-osdep/win32/Makefile
-build/Makefile
-build/msvc/Makefile
-build/msvc/dm/Makefile
-doc/ecell3.doxy
-doc/users-manual/info.ent
-])
-dnl
-AC_OUTPUT
Property changes on: ecell3/branches/ecell-3.1/ecell
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
ecell_config.h
ecell_config.h.in
install-sh
libtool
ltmain.sh
missing
py-compile
stamp-h
stamp-h.in
stamp-h1
tmp
+ Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.ac
depcomp
ecell_config.h
ecell_config.h.in
install-sh
libtool
ltmain.sh
missing
py-compile
stamp-h
stamp-h.in
stamp-h1
tmp
Copied: ecell3/branches/ecell-3.1/ecell/configure.ac.in (from rev 3186, ecell3/branches/ecell-3.1/ecell/configure.in)
===================================================================
--- ecell3/branches/ecell-3.1/ecell/configure.ac.in (rev 0)
+++ ecell3/branches/ecell-3.1/ecell/configure.ac.in 2008-10-11 07:35:21 UTC (rev 3192)
@@ -0,0 +1,316 @@
+AC_REVISION([$Id$])dnl
+
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT([ecell], [@ECELL_VERSION_NUMBER@])
+AC_CONFIG_SRCDIR([libecs/Entity.hpp])
+
+sinclude([../ecell_version.sh])
+
+
+AM_CONFIG_HEADER(ecell_config.h)
+
+AM_INIT_AUTOMAKE
+
+ECELL_DIRNAME=${PACKAGE}-${ECELL_MAJOR_VERSION}.${ECELL_MINOR_VERSION}
+
+ECELL_VERSION_STRING=\"${ECELL_VERSION_NUMBER}\"
+
+AC_DEFINE_UNQUOTED(ECELL_MAJOR_VERSION, ${ECELL_MAJOR_VERSION}, [Major version of the software.])
+AC_DEFINE_UNQUOTED(ECELL_MINOR_VERSION, ${ECELL_MINOR_VERSION}, [Minor version of the software.])
+AC_DEFINE_UNQUOTED(ECELL_MICRO_VERSION, ${ECELL_MICRO_VERSION}, [Micro version of the software.])
+AC_DEFINE_UNQUOTED(ECELL_VERSION_STRING, ${ECELL_VERSION_STRING}, [Full version string of the software.])
+AC_SUBST([ECELL_DIRNAME])
+AC_SUBST([ECELL_MAJOR_VERSION])
+AC_SUBST([ECELL_MINOR_VERSION])
+AC_SUBST([ECELL_MICRO_VERSION])
+AC_SUBST([ECELL_VERSION_STRING])
+
+
+AM_SANITY_CHECK
+
+AC_CANONICAL_HOST
+
+if test "$prefix" = "NONE" ; then
+ PREFIX="$ac_default_prefix"
+else
+ PREFIX="$prefix"
+fi
+
+AC_SUBST([PREFIX])
+
+AC_ARG_ENABLE([gui], [
+ AC_HELP_STRING([--disable-gui],
+ [build ecell without gui frontends.])
+ ], [],
+ [enable_gui=yes]
+)
+
+AC_MSG_CHECKING([whether to build GUI frontends])
+if test "$enable_gui" = "yes"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+fi
+
+AM_CONDITIONAL([ENABLE_GUI], [test "$enable_gui" = "yes"])
+dnl
+
+dnl Checks for programs.
+
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_CPP
+AC_PROG_CXXCPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+
+AM_DISABLE_STATIC
+AC_LIBLTDL_CONVENIENCE(../libltdl)
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+
+dnl to circumvent libltdl weirdness (already fixed in the newer versions)
+case $host_os in
+ *cygwin* | *mingw* | *win32*)
+ CPPFLAGS="$CPPFLAGS -DLT_SCOPE=extern"
+ ;;
+esac
+
+rm -f conftest
+./libtool --config > conftest
+. ./conftest
+rm -f conftest
+
+dnl compatibility for libtool 1.5.6
+
+LTDL_SHLIB_EXT=""
+if test -n "$shrext_cmds"; then
+ module=yes eval LTDL_SHLIB_EXT=\"$shrext_cmds\"
+ AC_SUBST(LTDL_SHLIB_EXT)
+dnl compatibility for libtool 1.5.0
+elif test -n "$shrext"; then
+ LTDL_SHLIB_EXT=$shrext
+ AC_SUBST(LTDL_SHLIB_EXT)
+dnl compatibility for libtool 1.4.x
+else
+ AC_CACHE_CHECK([which extension is used for shared libraries],
+ libltdl_cv_shlibext, [dnl
+ (
+ last=
+ for spec in $library_names_spec; do
+ last="$spec"
+ done
+ changequote(, )
+ echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
+ changequote([, ])
+ )
+ libltdl_cv_shlibext=`cat conftest`
+ rm -f conftest
+ ])
+ if test -n "$libltdl_cv_shlibext"; then
+ LTDL_SHLIB_EXT=$libltdl_cv_shlibext
+ AC_SUBST(LTDL_SHLIB_EXT)
+ fi
+fi
+
+
+
+AM_PATH_PYTHON(2.2)
+AC_SUBST(PYTHON)
+
+AC_LANG([C++])
+
+dnl Checks for libraries.
+
+dnl assuming libc and libm always present...
+
+AC_CHECK_LIB(m, sin, LIBM="-lm")
+AC_SUBST(LIBM)
+dnl
+AC_CHECK_LIB(c, open, LIBC="-lc")
+AC_SUBST(LIBC)
+dnl
+
+ECELL_CHECK_GSL
+
+AM_CHECK_PYMOD(numpy,,,[AC_MSG_ERROR([could not find Python numpy module])])
+AM_CHECK_PYMOD(xml,,,[AC_MSG_ERROR([could not find Python xml module])])
+
+if test "$enable_gui" = 'yes'; then
+ AM_CHECK_PYMOD(pygtk,,,[AC_MSG_ERROR([could not find Python pygtk module])])
+ AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR([could not find Python gtk module])])
+ AM_CHECK_PYMOD(gtk.gdk,,,
+ [AC_MSG_ERROR([could not find Python gtk.gdk module])])
+ AM_CHECK_PYMOD(gtk.glade,,,
+ [AC_MSG_ERROR([could not find Python gtk.glade module])])
+ AM_CHECK_PYMOD(gnome.ui,,[AC_SUBST([GNOME_INSTALLED],yes)],[AC_SUBST([GNOME_INSTALLED],no)])
+ AM_CHECK_PYMOD(gnomecanvas,,,[AC_MSG_WARN(could not find gnomecanvas module. model-editor will not work. )])
+ AM_CHECK_PYMOD(xml.dom.minidom,,,[AC_MSG_WARN(could not find xml.dom.minidom module. model-editor will not work.)])
+fi
+
+
+dnl Checks for header files.
+
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+
+AC_CHECK_HEADERS([fcntl.h unistd.h memory.h sys/stat.h sys/types.h sys/mman.h sys/param.h sys/statvfs.h sys/statfs.h sys/mount.h sys/vfs.h])
+AC_CHECK_HEADERS([unordered_map tr1/unordered_map])
+AC_CHECK_HEADERS([windows.h])
+
+AC_CHECK_HEADERS([stdint.h], [
+ INT64_T_DECLARATION="#include <stdint.h>"
+], [
+ AC_CHECK_TYPE([long long], [
+ INT64_T_DECLARATION="typedef long long int64_t; typedef unsigned long long uint64_t;"
+ ], [
+ AC_CHECK_TYPE([__int64], [
+ INT64_T_DECLARATION="typedef __int64 int64_t; typedef unsigned __int64 uint64_t;"
+ ], [
+ INT64_T_DECLARATION=
+ ])
+ ])
+])
+AC_SUBST([INT64_T_DECLARATION])
+
+ECELL_CHECK_MATH_HEADER
+ECELL_CHECK_INFINITY
+ECELL_CHECK_HUGE_VAL
+ECELL_CHECK_NUMERIC_LIMITS_DOUBLE_INFINITY
+
+if test "$HAVE_NUMERIC_LIMITS_DOUBLE_INFINITY" = 1; then
+ INFINITY_VAL="std::numeric_limits<double>::infinity()"
+elif test "$HAVE_INFINITY" = 1; then
+ INFINITY_VAL="INFINITY"
+elif test "$HAVE_HUGE_VAL" = 1; then
+ INFINITY_VAL="HUGE_VAL"
+fi
+AC_SUBST([INFINITY_VAL])
+
+ECELL_CHECK_PRETTY_FUNCTION
+
+EXT_GUESS="../../../.. ../../.. ../.. ../ ./ $prefix /usr /usr/local /opt"
+
+dnl dmtool package
+
+if test "$DMTOOL_DIR" = "" ; then
+ AC_MSG_CHECKING( for dmtool dir)
+ ac_cv_dmtool_dir="no"
+ for ac_dir in $EXT_GUESS ; do
+ if test -d $ac_dir/dmtool ; then
+ ac_cv_dmtool_dir=`(cd $ac_dir ; pwd)`
+ DMTOOL_DIR=$ac_cv_dmtool_dir
+ fi
+ done
+
+ if test "$DMTOOL_DIR" = "" ; then
+ AC_MSG_ERROR("dmtool not found.")
+ fi
+
+ AC_MSG_RESULT($ac_cv_dmtool_dir)
+ DMTOOL_DIR=$ac_cv_dmtool_dir
+ DMTOOL_INCLUDE_DIR=$ac_cv_dmtool_dir
+fi
+AC_SUBST(DMTOOL_DIR)
+AC_SUBST(DMTOOL_INCLUDE_DIR)
+
+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([Failed to find Python headers.])])
+ECELL_CHECK_PYTHON_LIBS
+AM_CONDITIONAL([HAVE_PYTHON_LIB], [test ! -z "$PYTHON_LIBS"])
+AC_SUBST([PYTHON_LIBS])
+
+ECELL_CHECK_NUMPY
+
+AC_MSG_CHECKING( if use of compiler specific features are allowed )
+
+AC_ARG_ENABLE( compiler-extensions,,
+ USE_COMPILER_EXTENSIONS=$enable_compiler_features,
+ USE_COMPILER_EXTENSIONS=yes
+ )
+AC_MSG_RESULT( $USE_COMPILER_EXTENSIONS )
+
+if test "$USE_COMPILER_EXTENSIONS" != no ; then
+ AC_MSG_CHECKING( for special compiler options )
+ AC_SUBST(USE_COMPILER_EXTENSIONS)
+ AC_DEFINE([USE_COMPILER_EXTENSIONS],1,[make use of compiler specific language features])
+ CXXFLAGS="$CXXFLAGS -Wno-pmf-conversions"
+ AC_SUBST(CXXFLAGS)
+ AC_MSG_RESULT( $CXXFLAGS )
+fi
+
+AC_LANG_PUSH([C])
+
+AC_SYS_LARGEFILE
+
+AC_C_CONST
+AC_C_INLINE
+if test "$ac_cv_c_inline" != no ; then
+ AC_DEFINE([HAVE_INLINE],1,[define if inline is supported])
+ AC_SUBST(HAVE_INLINE)
+fi
+
+AC_CHECK_TYPES([ssize_t],,,[
+#include <sys/types.h>
+])
+AC_TYPE_OFF_T
+AC_TYPE_SIZE_T
+AC_TYPE_SIGNAL
+AC_C_LONG_DOUBLE
+if test "$HAVE_LONG_DOUBLE" = 1; then
+ HIGHREAL_TYPE="long double"
+ HIGHREAL_IS_REAL=0
+else
+ HIGHREAL_TYPE="double"
+ HIGHREAL_IS_REAL=1
+fi
+AC_SUBST([HIGHREAL_TYPE])
+AC_SUBST([HIGHREAL_IS_REAL])
+
+AC_LANG_POP([])
+
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF(long double)
+
+
+dnl Checks for library functions.
+AC_TYPE_SIGNAL
+AC_CHECK_FUNCS(mkdir select strdup strerror strtod uname modf modfl)
+AC_CHECK_FUNCS(strdup strstr)
+
+AC_CONFIG_FILES([
+ Makefile
+ bin/Makefile
+ dm/Makefile
+ libecs/Defs.hpp
+ libecs/Makefile
+ libecs/tests/Makefile
+ libemc/Makefile
+ pyecell/Makefile
+ pyecell/setup.py
+ pyecell/ecell/config.py
+ frontend/Makefile
+ frontend/session-monitor/Makefile
+ frontend/session-monitor/glade/Makefile
+ frontend/session-monitor/plugins/Makefile
+ frontend/model-editor/Makefile
+ frontend/model-editor/doc/Makefile
+ frontend/model-editor/glade/Makefile
+ frontend/model-editor/plugins/Makefile
+])
+AC_CONFIG_FILES([bin/ecell3-dmc], [chmod +x bin/ecell3-dmc])
+AC_CONFIG_FILES([pyecell/ecell3-python], [chmod +x pyecell/ecell3-python])
+AC_CONFIG_FILES([pyecell/ecell3-em2eml], [chmod +x pyecell/ecell3-em2eml])
+AC_CONFIG_FILES([pyecell/ecell3-eml2em], [chmod +x pyecell/ecell3-eml2em])
+AC_CONFIG_FILES([pyecell/ecell3-eml2sbml], [chmod +x pyecell/ecell3-eml2sbml])
+AC_CONFIG_FILES([pyecell/ecell3-sbml2eml], [chmod +x pyecell/ecell3-sbml2eml])
+AC_CONFIG_FILES([pyecell/ecell3-session], [chmod +x pyecell/ecell3-session])
+AC_CONFIG_FILES([pyecell/ecell3-session-manager], [chmod +x pyecell/ecell3-session-manager])
+AC_OUTPUT
Property changes on: ecell3/branches/ecell-3.1/ecell/configure.ac.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Deleted: ecell3/branches/ecell-3.1/ecell/configure.in
===================================================================
--- ecell3/branches/ecell-3.1/ecell/configure.in 2008-10-11 07:27:47 UTC (rev 3191)
+++ ecell3/branches/ecell-3.1/ecell/configure.in 2008-10-11 07:35:21 UTC (rev 3192)
@@ -1,316 +0,0 @@
-AC_REVISION([$Id$])dnl
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT
-AC_CONFIG_SRCDIR([libecs/Entity.hpp])
-
-sinclude([../ecell_version.sh])
-
-
-AM_CONFIG_HEADER(ecell_config.h)
-
-AM_INIT_AUTOMAKE([ecell],${ECELL_VERSION_NUMBER})
-
-ECELL_DIRNAME=${PACKAGE}-${ECELL_MAJOR_VERSION}.${ECELL_MINOR_VERSION}
-
-ECELL_VERSION_STRING=\"${ECELL_VERSION_NUMBER}\"
-
-AC_DEFINE_UNQUOTED(ECELL_MAJOR_VERSION, ${ECELL_MAJOR_VERSION}, [Major version of the software.])
-AC_DEFINE_UNQUOTED(ECELL_MINOR_VERSION, ${ECELL_MINOR_VERSION}, [Minor version of the software.])
-AC_DEFINE_UNQUOTED(ECELL_MICRO_VERSION, ${ECELL_MICRO_VERSION}, [Micro version of the software.])
-AC_DEFINE_UNQUOTED(ECELL_VERSION_STRING, ${ECELL_VERSION_STRING}, [Full version string of the software.])
-AC_SUBST([ECELL_DIRNAME])
-AC_SUBST([ECELL_MAJOR_VERSION])
-AC_SUBST([ECELL_MINOR_VERSION])
-AC_SUBST([ECELL_MICRO_VERSION])
-AC_SUBST([ECELL_VERSION_STRING])
-
-
-AM_SANITY_CHECK
-
-AC_CANONICAL_HOST
-
-if test "$prefix" = "NONE" ; then
- PREFIX="$ac_default_prefix"
-else
- PREFIX="$prefix"
-fi
-
-AC_SUBST([PREFIX])
-
-AC_ARG_ENABLE([gui], [
- AC_HELP_STRING([--disable-gui],
- [build ecell without gui frontends.])
- ], [],
- [enable_gui=yes]
-)
-
-AC_MSG_CHECKING([whether to build GUI frontends])
-if test "$enable_gui" = "yes"; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
-AM_CONDITIONAL([ENABLE_GUI], [test "$enable_gui" = "yes"])
-dnl
-
-dnl Checks for programs.
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_CXXCPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-AM_DISABLE_STATIC
-AC_LIBLTDL_CONVENIENCE(../libltdl)
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
-dnl to circumvent libltdl weirdness (already fixed in the newer versions)
-case $host_os in
- *cygwin* | *mingw* | *win32*)
- CPPFLAGS="$CPPFLAGS -DLT_SCOPE=extern"
- ;;
-esac
-
-rm -f conftest
-./libtool --config > conftest
-. ./conftest
-rm -f conftest
-
-dnl compatibility for libtool 1.5.6
-
-LTDL_SHLIB_EXT=""
-if test -n "$shrext_cmds"; then
- module=yes eval LTDL_SHLIB_EXT=\"$shrext_cmds\"
- AC_SUBST(LTDL_SHLIB_EXT)
-dnl compatibility for libtool 1.5.0
-elif test -n "$shrext"; then
- LTDL_SHLIB_EXT=$shrext
- AC_SUBST(LTDL_SHLIB_EXT)
-dnl compatibility for libtool 1.4.x
-else
- AC_CACHE_CHECK([which extension is used for shared libraries],
- libltdl_cv_shlibext, [dnl
- (
- last=
- for spec in $library_names_spec; do
- last="$spec"
- done
- changequote(, )
- echo "$last" | sed 's/\[.*\]//;s/^[^.]*//;s/\$.*$//;s/\.$//' > conftest
- changequote([, ])
- )
- libltdl_cv_shlibext=`cat conftest`
- rm -f conftest
- ])
- if test -n "$libltdl_cv_shlibext"; then
- LTDL_SHLIB_EXT=$libltdl_cv_shlibext
- AC_SUBST(LTDL_SHLIB_EXT)
- fi
-fi
-
-
-
-AM_PATH_PYTHON(2.2)
-AC_SUBST(PYTHON)
-
-AC_LANG([C++])
-
-dnl Checks for libraries.
-
-dnl assuming libc and libm always present...
-
-AC_CHECK_LIB(m, sin, LIBM="-lm")
-AC_SUBST(LIBM)
-dnl
-AC_CHECK_LIB(c, open, LIBC="-lc")
-AC_SUBST(LIBC)
-dnl
-
-ECELL_CHECK_GSL
-
-AM_CHECK_PYMOD(numpy,,,[AC_MSG_ERROR([could not find Python numpy module])])
-AM_CHECK_PYMOD(xml,,,[AC_MSG_ERROR([could not find Python xml module])])
-
-if test "$enable_gui" = 'yes'; then
- AM_CHECK_PYMOD(pygtk,,,[AC_MSG_ERROR([could not find Python pygtk module])])
- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR([could not find Python gtk module])])
- AM_CHECK_PYMOD(gtk.gdk,,,
- [AC_MSG_ERROR([could not find Python gtk.gdk module])])
- AM_CHECK_PYMOD(gtk.glade,,,
- [AC_MSG_ERROR([could not find Python gtk.glade module])])
- AM_CHECK_PYMOD(gnome.ui,,[AC_SUBST([GNOME_INSTALLED],yes)],[AC_SUBST([GNOME_INSTALLED],no)])
- AM_CHECK_PYMOD(gnomecanvas,,,[AC_MSG_WARN(could not find gnomecanvas module. model-editor will not work. )])
- AM_CHECK_PYMOD(xml.dom.minidom,,,[AC_MSG_WARN(could not find xml.dom.minidom module. model-editor will not work.)])
-fi
-
-
-dnl Checks for header files.
-
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-
-AC_CHECK_HEADERS([fcntl.h unistd.h memory.h sys/stat.h sys/types.h sys/mman.h sys/param.h sys/statvfs.h sys/statfs.h sys/mount.h sys/vfs.h])
-AC_CHECK_HEADERS([unordered_map tr1/unordered_map])
-AC_CHECK_HEADERS([windows.h])
-
-AC_CHECK_HEADERS([stdint.h], [
- INT64_T_DECLARATION="#include <stdint.h>"
-], [
- AC_CHECK_TYPE([long long], [
- INT64_T_DECLARATION="typedef long long int64_t; typedef unsigned long long uint64_t;"
- ], [
- AC_CHECK_TYPE([__int64], [
- INT64_T_DECLARATION="typedef __int64 int64_t; typedef unsigned __int64 uint64_t;"
- ], [
- INT64_T_DECLARATION=
- ])
- ])
-])
-AC_SUBST([INT64_T_DECLARATION])
-
-ECELL_CHECK_MATH_HEADER
-ECELL_CHECK_INFINITY
-ECELL_CHECK_HUGE_VAL
-ECELL_CHECK_NUMERIC_LIMITS_DOUBLE_INFINITY
-
-if test "$HAVE_NUMERIC_LIMITS_DOUBLE_INFINITY" = 1; then
- INFINITY_VAL="std::numeric_limits<double>::infinity()"
-elif test "$HAVE_INFINITY" = 1; then
- INFINITY_VAL="INFINITY"
-elif test "$HAVE_HUGE_VAL" = 1; then
- INFINITY_VAL="HUGE_VAL"
-fi
-AC_SUBST([INFINITY_VAL])
-
-ECELL_CHECK_PRETTY_FUNCTION
-
-EXT_GUESS="../../../.. ../../.. ../.. ../ ./ $prefix /usr /usr/local /opt"
-
-dnl dmtool package
-
-if test "$DMTOOL_DIR" = "" ; then
- AC_MSG_CHECKING( for dmtool dir)
- ac_cv_dmtool_dir="no"
- for ac_dir in $EXT_GUESS ; do
- if test -d $ac_dir/dmtool ; then
- ac_cv_dmtool_dir=`(cd $ac_dir ; pwd)`
- DMTOOL_DIR=$ac_cv_dmtool_dir
- fi
- done
-
- if test "$DMTOOL_DIR" = "" ; then
- AC_MSG_ERROR("dmtool not found.")
- fi
-
- AC_MSG_RESULT($ac_cv_dmtool_dir)
- DMTOOL_DIR=$ac_cv_dmtool_dir
- DMTOOL_INCLUDE_DIR=$ac_cv_dmtool_dir
-fi
-AC_SUBST(DMTOOL_DIR)
-AC_SUBST(DMTOOL_INCLUDE_DIR)
-
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([Failed to find Python headers.])])
-ECELL_CHECK_PYTHON_LIBS
-AM_CONDITIONAL([HAVE_PYTHON_LIB], [test ! -z "$PYTHON_LIBS"])
-AC_SUBST([PYTHON_LIBS])
-
-ECELL_CHECK_NUMPY
-
-AC_MSG_CHECKING( if use of compiler specific features are allowed )
-
-AC_ARG_ENABLE( compiler-extensions,,
- USE_COMPILER_EXTENSIONS=$enable_compiler_features,
- USE_COMPILER_EXTENSIONS=yes
- )
-AC_MSG_RESULT( $USE_COMPILER_EXTENSIONS )
-
-if test "$USE_COMPILER_EXTENSIONS" != no ; then
- AC_MSG_CHECKING( for special compiler options )
- AC_SUBST(USE_COMPILER_EXTENSIONS)
- AC_DEFINE([USE_COMPILER_EXTENSIONS],1,[make use of compiler specific language features])
- CXXFLAGS="$CXXFLAGS -Wno-pmf-conversions"
- AC_SUBST(CXXFLAGS)
- AC_MSG_RESULT( $CXXFLAGS )
-fi
-
-AC_LANG_PUSH([C])
-
-AC_SYS_LARGEFILE
-
-AC_C_CONST
-AC_C_INLINE
-if test "$ac_cv_c_inline" != no ; then
- AC_DEFINE([HAVE_INLINE],1,[define if inline is supported])
- AC_SUBST(HAVE_INLINE)
-fi
-
-AC_CHECK_TYPES([ssize_t],,,[
-#include <sys/types.h>
-])
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
-AC_C_LONG_DOUBLE
-if test "$HAVE_LONG_DOUBLE" = 1; then
- HIGHREAL_TYPE="long double"
- HIGHREAL_IS_REAL=0
-else
- HIGHREAL_TYPE="double"
- HIGHREAL_IS_REAL=1
-fi
-AC_SUBST([HIGHREAL_TYPE])
-AC_SUBST([HIGHREAL_IS_REAL])
-
-AC_LANG_POP([])
-
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-AC_CHECK_SIZEOF(double)
-AC_CHECK_SIZEOF(long double)
-
-
-dnl Checks for library functions.
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(mkdir select strdup strerror strtod uname modf modfl)
-AC_CHECK_FUNCS(strdup strstr)
-
-AC_CONFIG_FILES([
- Makefile
- bin/Makefile
- dm/Makefile
- libecs/Defs.hpp
- libecs/Makefile
- libecs/tests/Makefile
- libemc/Makefile
- pyecell/Makefile
- pyecell/setup.py
- pyecell/ecell/config.py
- frontend/Makefile
- frontend/session-monitor/Makefile
- frontend/session-monitor/glade/Makefile
- frontend/session-monitor/plugins/Makefile
- frontend/model-editor/Makefile
- frontend/model-editor/doc/Makefile
- frontend/model-editor/glade/Makefile
- frontend/model-editor/plugins/Makefile
-])
-AC_CONFIG_FILES([bin/ecell3-dmc], [chmod +x bin/ecell3-dmc])
-AC_CONFIG_FILES([pyecell/ecell3-python], [chmod +x pyecell/ecell3-python])
-AC_CONFIG_FILES([pyecell/ecell3-em2eml], [chmod +x pyecell/ecell3-em2eml])
-AC_CONFIG_FILES([pyecell/ecell3-eml2em], [chmod +x pyecell/ecell3-eml2em])
-AC_CONFIG_FILES([pyecell/ecell3-eml2sbml], [chmod +x pyecell/ecell3-eml2sbml])
-AC_CONFIG_FILES([pyecell/ecell3-sbml2eml], [chmod +x pyecell/ecell3-sbml2eml])
-AC_CONFIG_FILES([pyecell/ecell3-session], [chmod +x pyecell/ecell3-session])
-AC_CONFIG_FILES([pyecell/ecell3-session-manager], [chmod +x pyecell/ecell3-session-manager])
-AC_OUTPUT
Modified: ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in
===================================================================
--- ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in 2008-10-11 07:27:47 UTC (rev 3191)
+++ ecell3/branches/ecell-3.1/ecell/pyecell/ecell/config.py.in 2008-10-11 07:35:21 UTC (rev 3192)
@@ -29,6 +29,7 @@
__all__ = (
'PACKAGE',
+ 'PACkAGE_TARNAME',
'per_app_dir_name',
'version',
'version_info',
@@ -55,6 +56,7 @@
return os.path.abspath( sys.argv[0] )
PACKAGE = "@PACKAGE@"
+PACKAGE_TARNAME = "@PACKAGE_TARNAME@"
per_app_dir_name = "@ECELL_DIRNAME@"
version = "@VERSION@"
version_info = {
Modified: ecell3/branches/ecell-3.1/ecell_version.sh
===================================================================
--- ecell3/branches/ecell-3.1/ecell_version.sh 2008-10-11 07:27:47 UTC (rev 3191)
+++ ecell3/branches/ecell-3.1/ecell_version.sh 2008-10-11 07:35:21 UTC (rev 3192)
@@ -1,6 +1,6 @@
ECELL_MAJOR_VERSION=3
ECELL_MINOR_VERSION=1
-ECELL_MICRO_VERSION=106
-ECELL_PACKAGE_REVISION=
+ECELL_MICRO_VERSION=107
+ECELL_PACKAGE_REVISION=dev
ECELL_VERSION_NUMBER=${ECELL_MAJOR_VERSION}.${ECELL_MINOR_VERSION}.${ECELL_MICRO_VERSION}${ECELL_PACKAGE_REVISION}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
