bump version, add version number to ctlgeom.h

Author: stevengj

NEWS.md

@@ -1,5 +1,15 @@
 # Libctl Release Notes
 
+## libctl 4.5.0
+
+* New `make_slanted_prism` functions to make a prism with
+  a given sidewall angle (#53).
+
+* Defined `LIBCTL_MAJOR_VERSION` etc. in `ctlgeom.h` header file when
+  using stand-alone libctlgeom.
+
+* Bugfix in point-in-prism test (#49).
+
 ## libctl 4.4.0
 
 11/12/19

configure.ac

@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(libctl, 4.4.0, stevenj@alum.mit.edu)
+AC_INIT(libctl, 4.5.0, stevenj@alum.mit.edu)
 AC_CONFIG_SRCDIR([src/ctl.c])
 AC_CONFIG_HEADERS([config.h src/ctl.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -8,7 +8,7 @@ AM_MAINTAINER_MODE
 # Shared-library version number; indicates api compatibility, and is
 # not the same as the "public" version number.  (Don't worry about this
 # except for public releases.)
-SHARED_VERSION_INFO="9:0:2" # CURRENT:REVISION:AGE
+SHARED_VERSION_INFO="10:0:3" # CURRENT:REVISION:AGE
 
 AM_INIT_AUTOMAKE([foreign])
 AC_SUBST(SHARED_VERSION_INFO)
@@ -29,6 +29,9 @@ test "x$LIBCTL_BUGFIX_VERSION" = x && LIBCTL_BUGFIX_VERSION=0
 AC_DEFINE_UNQUOTED(LIBCTL_MAJOR_VERSION, $LIBCTL_MAJOR_VERSION, [major v.])
 AC_DEFINE_UNQUOTED(LIBCTL_MINOR_VERSION, $LIBCTL_MINOR_VERSION, [minor v.])
 AC_DEFINE_UNQUOTED(LIBCTL_BUGFIX_VERSION, $LIBCTL_BUGFIX_VERSION, [bugfix v.])
+AC_SUBST(LIBCTL_MAJOR_VERSION)
+AC_SUBST(LIBCTL_MINOR_VERSION)
+AC_SUBST(LIBCTL_BUGFIX_VERSION)
 
 ###########################################################################
 

utils/Makefile.am

@@ -42,6 +42,11 @@ ctl-io.h: geom.scm $(GEN_CTL_IO)
 
 ctlgeom-types.h: ctl-io.h
 	sed 's,SCM,void*,;s,ctl\.h,ctl-math.h,' ctl-io.h > $@
+	echo '#ifndef LIBCTL_MAJOR_VERSION' >> $@
+	echo '#  define LIBCTL_MAJOR_VERSION '$(LIBCTL_MAJOR_VERSION) >> $@
+	echo '#  define LIBCTL_MINOR_VERSION '$(LIBCTL_MINOR_VERSION) >> $@
+	echo '#  define LIBCTL_BUGFIX_VERSION '$(LIBCTL_BUGFIX_VERSION) >> $@
+	echo '#endif' >> $@
 
 geom-ctl-io.c: ctl-io.c
 	sed 's,ctl-io\.h,ctlgeom-types.h,;s,/.* Input variables .*/,@#include "geom-ctl-io-defaults.c"@#if 0@,;s,/.* Output variables .*/,#endif@,' ctl-io.c | tr '@' '\n' > $@