clean up package version splitting

introduce an autoconf macro to do the work that takes care of not
overwriting variables

gstlal-calibration/configure.ac

@@ -30,14 +30,10 @@ AC_CONFIG_FILES([ \
 #
 
 
-_orig_VERSION=${VERSION}
-VERSION=${PACKAGE_VERSION}
-AX_SPLIT_VERSION
-AC_SUBST([PACKAGE_VERSION_MAJOR], [${AX_MAJOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_MINOR], [${AX_MINOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_POINT], [${AX_POINT_VERSION}])
-VERSION=${_orig_VERSION}
-unset _orig_VERSION
+AX_GSTLAL_SPLIT_VERSION([PACKAGE_VERSION])
+AC_SUBST([PACKAGE_VERSION_MAJOR])
+AC_SUBST([PACKAGE_VERSION_MINOR])
+AC_SUBST([PACKAGE_VERSION_POINT])
 
 
 #

gstlal-calibration/gnuscripts/ax_gstlal_split_version.m4

+AC_DEFUN([AX_GSTLAL_SPLIT_VERSION], [
+dnl save VERSION and AX_*_VERSION variables
+_orig_VERSION=$VERSION
+for part in MAJOR MINOR POINT ; do
+	eval _orig_AX_${part}_VERSION=\$AX_${part}_VERSION
+done
+dnl split the argument
+eval VERSION=\$$1
+AX_SPLIT_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval $1_${part}=\$AX_${part}_VERSION
+done
+dnl restore VERSION and AX_*_VERSION to orignal values
+VERSION=$_orig_VERSION
+unset _orig_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval AX_${part}_VERSION=\$_orig_AX_${part}_VERSION
+	unset _orig_AX_${part}_VERSION
+done
+])

gstlal-inspiral/configure.ac

@@ -38,14 +38,10 @@ AC_CONFIG_FILES([ \
 #
 
 
-_orig_VERSION=${VERSION}
-VERSION=${PACKAGE_VERSION}
-AX_SPLIT_VERSION
-AC_SUBST([PACKAGE_VERSION_MAJOR], [${AX_MAJOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_MINOR], [${AX_MINOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_POINT], [${AX_POINT_VERSION}])
-VERSION=${_orig_VERSION}
-unset _orig_VERSION
+AX_GSTLAL_SPLIT_VERSION([PACKAGE_VERSION])
+AC_SUBST([PACKAGE_VERSION_MAJOR])
+AC_SUBST([PACKAGE_VERSION_MINOR])
+AC_SUBST([PACKAGE_VERSION_POINT])
 
 
 #

gstlal-inspiral/gnuscripts/ax_gstlal_split_version.m4

+AC_DEFUN([AX_GSTLAL_SPLIT_VERSION], [
+dnl save VERSION and AX_*_VERSION variables
+_orig_VERSION=$VERSION
+for part in MAJOR MINOR POINT ; do
+	eval _orig_AX_${part}_VERSION=\$AX_${part}_VERSION
+done
+dnl split the argument
+eval VERSION=\$$1
+AX_SPLIT_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval $1_${part}=\$AX_${part}_VERSION
+done
+dnl restore VERSION and AX_*_VERSION to orignal values
+VERSION=$_orig_VERSION
+unset _orig_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval AX_${part}_VERSION=\$_orig_AX_${part}_VERSION
+	unset _orig_AX_${part}_VERSION
+done
+])

gstlal-ugly/configure.ac

@@ -41,14 +41,10 @@ AC_CONFIG_FILES([ \
 #
 
 
-_orig_VERSION=${VERSION}
-VERSION=${PACKAGE_VERSION}
-AX_SPLIT_VERSION
-AC_SUBST([PACKAGE_VERSION_MAJOR], [${AX_MAJOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_MINOR], [${AX_MINOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_POINT], [${AX_POINT_VERSION}])
-VERSION=${_orig_VERSION}
-unset _orig_VERSION
+AX_GSTLAL_SPLIT_VERSION([PACKAGE_VERSION])
+AC_SUBST([PACKAGE_VERSION_MAJOR])
+AC_SUBST([PACKAGE_VERSION_MINOR])
+AC_SUBST([PACKAGE_VERSION_POINT])
 
 
 #

gstlal-ugly/gnuscripts/ax_gstlal_split_version.m4

+AC_DEFUN([AX_GSTLAL_SPLIT_VERSION], [
+dnl save VERSION and AX_*_VERSION variables
+_orig_VERSION=$VERSION
+for part in MAJOR MINOR POINT ; do
+	eval _orig_AX_${part}_VERSION=\$AX_${part}_VERSION
+done
+dnl split the argument
+eval VERSION=\$$1
+AX_SPLIT_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval $1_${part}=\$AX_${part}_VERSION
+done
+dnl restore VERSION and AX_*_VERSION to orignal values
+VERSION=$_orig_VERSION
+unset _orig_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval AX_${part}_VERSION=\$_orig_AX_${part}_VERSION
+	unset _orig_AX_${part}_VERSION
+done
+])

gstlal/configure.ac

@@ -39,14 +39,10 @@ AC_CONFIG_FILES([ \
 #
 
 
-_orig_VERSION=${VERSION}
-VERSION=${PACKAGE_VERSION}
-AX_SPLIT_VERSION
-AC_SUBST([PACKAGE_VERSION_MAJOR], [${AX_MAJOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_MINOR], [${AX_MINOR_VERSION}])
-AC_SUBST([PACKAGE_VERSION_POINT], [${AX_POINT_VERSION}])
-VERSION=${_orig_VERSION}
-unset _orig_VERSION
+AX_GSTLAL_SPLIT_VERSION([PACKAGE_VERSION])
+AC_SUBST([PACKAGE_VERSION_MAJOR])
+AC_SUBST([PACKAGE_VERSION_MINOR])
+AC_SUBST([PACKAGE_VERSION_POINT])
 
 
 #

gstlal/gnuscripts/ax_gstlal_split_version.m4

+AC_DEFUN([AX_GSTLAL_SPLIT_VERSION], [
+dnl save VERSION and AX_*_VERSION variables
+_orig_VERSION=$VERSION
+for part in MAJOR MINOR POINT ; do
+	eval _orig_AX_${part}_VERSION=\$AX_${part}_VERSION
+done
+dnl split the argument
+eval VERSION=\$$1
+AX_SPLIT_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval $1_${part}=\$AX_${part}_VERSION
+done
+dnl restore VERSION and AX_*_VERSION to orignal values
+VERSION=$_orig_VERSION
+unset _orig_VERSION
+for part in MAJOR MINOR POINT ; do
+	eval AX_${part}_VERSION=\$_orig_AX_${part}_VERSION
+	unset _orig_AX_${part}_VERSION
+done
+])