Browse Source

Add correct version information.

Brian Aker 12 years ago
parent
commit
541511f52c
4 changed files with 18 additions and 6 deletions
  1. 2 1
      configure.ac
  2. 2 0
      libtest/include.am
  3. 7 5
      libtest/version.h.in
  4. 7 0
      libtest/yatl.m4

+ 2 - 1
configure.ac

@@ -61,6 +61,8 @@ BOOST_THREADS
 AX_CXX_CINTTYPES
 CONFIG_EXTRA
 
+m4_include([libtest/yatl.m4])
+
 WITH_LIBMEMCACHED
 m4_include([m4/memcached.m4])
 m4_include([m4/memcached_sasl.m4])
@@ -238,7 +240,6 @@ AX_CHECK_LIBRARY([LIBUUID], [uuid/uuid.h], [uuid],
                   ])
 
 
-AC_CONFIG_FILES([libtest/version.h])
 AC_CONFIG_FILES(Makefile
                 docs/conf.py
                 libgearman-1.0/version.h

+ 2 - 0
libtest/include.am

@@ -31,6 +31,7 @@ drd:
 	@echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\""
 
 EXTRA_DIST+= libtest/run.gdb
+EXTRA_DIST+= libtest/version.h
 
 CLEANFILES+= tmp_chroot/etc/*
 CLEANFILES+= tmp_chroot/var/drizzle/*
@@ -80,6 +81,7 @@ noinst_HEADERS+= libtest/test.h
 noinst_HEADERS+= libtest/test.hpp 
 noinst_HEADERS+= libtest/tmpfile.hpp 
 noinst_HEADERS+= libtest/vchar.hpp 
+noinst_HEADERS+= libtest/version.h 
 noinst_HEADERS+= libtest/visibility.h 
 noinst_HEADERS+= libtest/wait.h
 

+ 7 - 5
libtest/version.h.in

@@ -1,8 +1,9 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Data Differential YATL (i.e. libtest) library
  *
- *  Data Differential YATL (i.e. libtest)  library
- *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -34,7 +35,8 @@
  *
  */
 
+
 #pragma once
 
-#define LIBTEST_VERSION_STRING "@VERSION@"
-#define LIBTEST_VERSION_HEX @HEX_VERSION@
+#define LIBTEST_VERSION @LIBTEST_VERSION@
+#define LIBTEST_VERSION_STRING "@LIBTEST_VERSION@"

+ 7 - 0
libtest/yatl.m4

@@ -0,0 +1,7 @@
+dnl Copyright (C) 2012 Data Differential, LLC.
+dnl This file is free software; Data Differential, LLC.
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_SUBST([LIBTEST_VERSION], [1.0])
+AC_CONFIG_FILES([libtest/version.h])