From 3d7d4a7a51098869069cc37b4a2ace453a881536 Mon Sep 17 00:00:00 2001 From: gustavo Date: Mon, 8 Feb 1999 14:15:11 +0000 Subject: [PATCH] learning about autoconf: eoBin and bvector.h --- eo/Makefile.am | 1 - eo/acconfig.h | 1 + eo/configure.in | 6 ++++++ eo/src/Makefile.am | 1 + eo/src/eoBinOp.h | 5 ++--- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/eo/Makefile.am b/eo/Makefile.am index 1f6b0801..cb4127aa 100644 --- a/eo/Makefile.am +++ b/eo/Makefile.am @@ -5,4 +5,3 @@ ############################################################################### SUBDIRS = src test - diff --git a/eo/acconfig.h b/eo/acconfig.h index e1b82a58..49821294 100644 --- a/eo/acconfig.h +++ b/eo/acconfig.h @@ -1,2 +1,3 @@ #undef PACKAGE #undef VERSION +#undef HAVE_BIT_VECTOR diff --git a/eo/configure.in b/eo/configure.in index 644bf146..0fcbd1c0 100644 --- a/eo/configure.in +++ b/eo/configure.in @@ -2,7 +2,13 @@ AC_INIT(src/eo) AM_INIT_AUTOMAKE(eo, 0.0.0) +AM_CONFIG_HEADER(config.h:config.in) + AC_PROG_CXX + +AC_CHECK_HEADERS(bvector.h) +AC_EGREP_HEADER(bit_vector, bvector.h, AC_DEFINE(HAVE_BIT_VECTOR)) + AM_PROG_LIBTOOL AM_MAINTAINER_MODE diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am index 645d84b0..6bb9f723 100644 --- a/eo/src/Makefile.am +++ b/eo/src/Makefile.am @@ -6,5 +6,6 @@ lib_LTLIBRARIES = libeo.la libeo_la_SOURCES = eoPrintable.cpp eoPersistent.cpp + libeoincdir = $(includedir)/eo libeoinc_HEADERS = eo EO.h eoDup.h eoMultiMonOp.h eoPop.h eoUniform.h eoESChrom.h eoNegExp.h eoProblem.h eoVector.h eoFitness.h eoNormal.h eoRnd.h eoXOver2.h eo1d.h eoID.h eoObject.h eoString.h eoAged.h eoKill.h eoOp.h eoTranspose.h eoBin.h eoPrintable.h eoPersistent.h eoLottery.h eoMutation.h eoPopOps.h eoUniform.h eoInsertion.h eoBinOp.h diff --git a/eo/src/eoBinOp.h b/eo/src/eoBinOp.h index 67a8403d..4708f2ab 100644 --- a/eo/src/eoBinOp.h +++ b/eo/src/eoBinOp.h @@ -7,8 +7,8 @@ //----------------------------------------------------------------------------- -#include // eoBin -#include // eoMonOp +#include // eoBin +#include // eoMonOp //----------------------------------------------------------------------------- // eoBinRandom --> mofify a chromosome in a random way @@ -340,5 +340,4 @@ template class eoBinUxOver: public eoBinOp //----------------------------------------------------------------------------- - #endif eoBinOp_h