[ghemical-devel] support for MPQC v2 was added

[Michael Banck]

On Mon, May 20, 2002 at 02:38:59PM +0300, Tommi Hassinen wrote:
> On Mon, 20 May 2002, Michael Banck wrote:
> 
> > Actually, sc-config --version is already parsed by aclocal.m4, I just
> > didn't AC_SUBST the versions. Patch attached.
> 
> Thanks, I looked at it and was even able to change the minimum version
> to 2.1.0

You are not dropping 1.2.5 support though, are you?

> but still I could not figure out how to make MPQC_VERSION appear in
> config.h...
 
Ah, OK. Forgot about this one.

> So, I think it would work nicely if we could make ENABLE_MPQC and
> MPQC_VERSION appear side-by-side in config.h, for example
> 
> #define ENABLE_MPQC
> #define MPQC_VERSION 2

This should work:

--- /home/mbanck/src/cvs/ghemical/configure.in  Fri Feb 22 20:13:10 2002
+++ configure.in        Mon May 20 13:42:48 2002
@@ -57,6 +57,7 @@
         AM_PATH_SC(1.2.5, HAVE_MPQC="yes", HAVE_MPQC="no")
         if test "${HAVE_MPQC}" = "yes"; then
                 AC_DEFINE(ENABLE_MPQC)
+               AC_DEFINE_UNQUOTED(MPQC_VERSION, $SC_MAJOR_VERSION)
         else AC_MSG_ERROR([Cannot find proper SC version])
         fi
 fi

It outputs 

/* This is the MPQC major version found bei configure */
#define MPQC_VERSION 2

in my config.h after I added 

/* This is the MPQC major version found bei configure */
#undef MPQC_VERSION

to src/config.h.in

In this case you can drop my comment on src/common/qm1e_mpqc.h of
course, I wasn't paying attention.

> > Maybe you want to adjust the minimal libsc-version in configure.in, I
> > don't know. 
> 
> I guess that we could use the limits like
> 
> 	from 1.2.0 to 1.2.5 (or 1.2.9) -> MPQC_VERSION=1
> 	from 2.0.0 to 2.1.1 (or 2.2.9) -> MPQC_VERSION=2
>
> I have only seen bigger diffences that we need to handle between v1 and
> v2, not in the minor versions.

So MPQC_VERSION == SC_MAJOR_VERSION (i.e. the first of the three digits)
is enough for the moment?

I've left the minimum version stuff in there when I adopted the GTK M4
macro. It might not serve ghemical, but perhaps other projects which
might depend on mpqc.

bye,

Michael