commit c3a4a82648a1a34f6f10dc8e0b36ed3c106aeae9
Author: František Dvořák <valtri@civ.zcu.cz>
Date:   Wed Apr 29 13:49:59 2015 +0200

    Condor classad autotools update.

diff --git a/src/classad/Makefile.am.m4 b/src/classad/Makefile.am.m4
index 78f4a34..18277b6 100644
--- a/src/classad/Makefile.am.m4
+++ b/src/classad/Makefile.am.m4
@@ -93,7 +93,8 @@ nobase_include_HEADERS =						\
 	classad/exprTree.h classad/query.h classad/xmlSink.h		\
 	classad/classadItor.h classad/fnCall.h classad/sink.h		\
 	classad/xmlSource.h classad/classad_stl.h classad/indexfile.h	\
-	classad/source.h
+	classad/source.h \
+	classad/classadCache.h
 
 bin_PROGRAMS = 								\
 	classad_functional_tester					\
@@ -115,13 +116,13 @@ check_PROGRAMS =							\
 	$(TESTS)
 
 libclassad_la_SOURCES = \
-	attrrefs.cpp classad.cpp common.cpp collection.cpp collectionBase.cpp debug.cpp	\
+	attrrefs.cpp classad.cpp classadCache.cpp common.cpp collection.cpp collectionBase.cpp debug.cpp	\
 	exprList.cpp exprTree.cpp fnCall.cpp indexfile.cpp lexer.cpp		\
 	lexerSource.cpp literals.cpp matchClassad.cpp operators.cpp query.cpp	\
 	sink.cpp source.cpp transaction.cpp util.cpp value.cpp view.cpp xmlLexer.cpp	\
 	xmlSink.cpp xmlSource.cpp cclassad.cpp $(_libclassad_la_SOURCES)
 
-libclassad_la_LDFLAGS = -version-info 2:0:0
+libclassad_la_LDFLAGS = -version-info @VERSION_INFO@
 
 MF_DEFINE_PROGRAM([cxi])
 
diff --git a/src/classad/configure.ac b/src/classad/configure.ac
index bcc2b88..91eeb32 100644
--- a/src/classad/configure.ac
+++ b/src/classad/configure.ac
@@ -34,7 +34,7 @@ AC_DEFUN([gl_COMPILER_FLAGS],
 
 
 AC_PREREQ(2.57)
-AC_INIT([classad], [1.0-rc5], [condor-admin@cs.wisc.edu])
+AC_INIT([classad], [8.3.5], [condor-admin@cs.wisc.edu])
 #AC_CONFIG_AUX_DIR([build-aux])
 #AM_INIT_AUTOMAKE([1.6.3 -Wall -Werror foreign])
 AM_INIT_AUTOMAKE([1.6.3 foreign])
@@ -42,6 +42,19 @@ AC_CONFIG_SRCDIR([classad.cpp])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile])
 
+CLASSAD_VERSION=$PACKAGE_VERSION
+CLASSAD_VERSION_MAJOR=$(echo $PACKAGE_VERSION | cut -d. -f1)
+CLASSAD_VERSION_MINOR=$(echo $PACKAGE_VERSION | cut -d. -f2)
+CLASSAD_VERSION_PATCH=$(echo $PACKAGE_VERSION | cut -d. -f3)
+
+# for shared library version
+# increase by CLASSAD_VERSION_MINOR on major version upgrades
+lt_offset=-1
+
+let lt_major=$lt_offset+$CLASSAD_VERSION_MAJOR+$CLASSAD_VERSION_MINOR
+VERSION_INFO="$lt_major:$CLASSAD_VERSION_PATCH:$CLASSAD_VERSION_MINOR"
+AC_SUBST(VERSION_INFO)
+
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
@@ -61,6 +74,8 @@ gl_COMPILER_FLAGS([-Winvalid-pch])
 gl_COMPILER_FLAGS([-Woverloaded-virtual])
 gl_COMPILER_FLAGS([-Wno-system-headers])
 CXXFLAGS="$COMPILER_FLAGS $CXXFLAGS"
+CXXFLAGS="--std=c++11 $CXXFLAGS"
+CPPFLAGS="-DCLASSAD_VERSION=\\\"$CLASSAD_VERSION\\\" -DCLASSAD_VERSION_MAJOR=$CLASSAD_VERSION_MAJOR -DCLASSAD_VERSION_MINOR=$CLASSAD_VERSION_MINOR -DCLASSAD_VERSION_PATCH=$CLASSAD_VERSION_PATCH $CPPFLAGS"
 
 # Checks for header files.
 AC_HEADER_STDC