Changes in configure.ac [6ac15b:c88cde]

File:

• configure.ac (modified) (1 diff)

configure.ac

@@ -3 +3 @@
 
 AC_PREREQ(2.59)
-AC_INIT(Molecuilder, 1.0, heber@ins.uni-bonn.de, molecuilder)
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_SRCDIR([src/builder.cpp])
+AC_INIT([ElectronicStructurePACKage], 1.1, heber@ins.uni-bonn.de, ESPACK)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_SRCDIR([pcp/src/pcp.c])
 AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE(dist-bzip2)
 
-# Checks for programs.
-AM_PATH_CPPUNIT(1.9.6)
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_CHECK_PROG([LATEX],[latex],[latex],[:])
-AC_CHECK_PROG([BIBTEX],[bibtex],[bibtex],[:])
-AC_CHECK_PROG([DVIPS],[dvips],[dvips],[:])
-AC_CHECK_PROG([PDFLATEX],[pdflatex],[pdflatex],[:])
-AC_CHECK_PROG([XMLTO],[xmlto],[xmlto],[:])
-AM_MISSING_PROG([DOXYGEN], [doxygen])
+AC_CANONICAL_HOST
 
-# Checks for libraries.
-AC_CHECK_LIB(m, sqrt, ,AC_MSG_ERROR([compatible libc math library not found]))
-
-# Boost libraries
-AX_BOOST_BASE([1.40])
-AX_BOOST_PROGRAM_OPTIONS
-#AX_BOOST_FOREACH
-#AX_BOOST_FILESYSTEM
-AX_BOOST_THREAD
-#AX_BOOST_SERIALIZATION
-
-#QT4 libraries
-gw_CHECK_QT4
-AX_CHECK_GLU
-AC_MSG_NOTICE(["GLU_CFLAGS: $GLU_CFLAGS, GLU_CXXFLAGS: $GLU_CXXFLAGS, GLU_LDFLAGS: $GLU_LDFLAGS, GLU_LIBS: $GLU_LIBS"])
-
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([sys/time.h])
-AC_HEADER_STDBOOL
-
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([floor pow sqrt strchr])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_C_RESTRICT
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-# check for GNU Scientific Library
-AC_CHECK_HEADERS([gsl/gsl_blas.h])
-AC_SEARCH_LIBS(dnrm2, goto blas cblas gslblas gslcblas)
-AC_CHECK_LIB(gsl, main, [], 
-        [AC_SEARCH_LIBS(cblas_dnrm2, blas cblas gslblas gslcblas)])
-AC_CHECK_LIB(gsl, gsl_blas_dnrm2, , [AC_MSG_ERROR(["No working BLAS found for GSL, stopping."])])
-
-# add replacement/saturation hydrogen or not 
-AC_ARG_ENABLE([hydrogen],AS_HELP_STRING([--enable-hydrogen],[Adding saturation hydrogen (default is yes)]),
-              [enable_hydrogen=$enableval], [enable_hydrogen=yes])
-if test x"$enable_hydrogen" = xyes; then
-  AC_DEFINE(ADDHYDROGEN,1, ["Adding saturation hydrogen"])
-  AC_SUBST(ADDHYDROGEN)
-fi
-
-# add replacement/saturation hydrogen or not 
-AC_ARG_ENABLE([ecut],AS_HELP_STRING([--enable-ecut],[Use ECut TestRunnerClient (default is no)]),
-              [enable_ecut=$enableval], [enable_ecut=no])
-if test x"$enable_ecut" = xyes; then
-  AC_DEFINE(HAVE_ECUT,1, ["Use ECut TestRunnerClient instead of our own."])
-  AC_SUBST(HAVE_ECUT)
-fi
-
-# Check for "extern inline", using a modified version
-# of the test for AC_C_INLINE from acspecific.mt
-AC_CACHE_CHECK([for extern inline], ac_cv_c_extern_inline,
-[ac_cv_c_extern_inline=no
-AC_TRY_COMPILE([extern $ac_cv_c_inline double foo(double x);
-extern $ac_cv_c_inline double foo(double x) { return x+1.0; };
-double foo (double x) { return x + 1.0; };], 
-[  foo(1.0)  ],
-[ac_cv_c_extern_inline="yes"])
-])
-
-if test "$ac_cv_c_inline" != no ; then
-  AC_DEFINE(HAVE_INLINE,1, ["May use inline routines"])
-  AC_SUBST(HAVE_INLINE)
-fi
-
-#AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
-
-# test suite
-AC_CONFIG_TESTDIR(tests/regression)
-AC_CONFIG_FILES([
-        tests/Makefile
-        tests/regression/atlocal 
-        tests/regression/Makefile])
-AC_CONFIG_FILES([tests/regression/molecuilder], [chmod +x tests/regression/molecuilder])
-AC_CONFIG_FILES([
-        tests/Tesselations/Makefile 
-        tests/Tesselations/defs])
-AC_CONFIG_FILES([
-        doc/molecuilder.xml])
-AC_CONFIG_FILES([
-        Makefile 
-        doc/Makefile 
-        src/Makefile 
-        src/Actions/Makefile
-        src/UIElements/Makefile
-        src/unittests/Makefile])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_SUBDIRS([pcp util molecuilder])
 AC_OUTPUT