Merge updates to defncopy into Branch-1_4

FreeTDS · Mar 31, 2024 · 17100bc · 17100bc
2 parents 660c99e + 3585d56
commit 17100bc
Show file tree

Hide file tree

Showing 7 changed files with 789 additions and 103 deletions.
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ dnl ------------------------------------------------------------
 # ------------------------------------------------------------
 # Initialization
 # ------------------------------------------------------------
-AC_INIT(FreeTDS, 1.4.11)
+AC_INIT(FreeTDS, 1.4.12)
 AC_CONFIG_SRCDIR(src/dblib/dblib.c)
 AC_PREREQ(2.53)
 
@@ -1003,6 +1003,7 @@ AC_CONFIG_FILES(include/freetds/version.h \
 	src/odbc/unittests/Makefile \
 	src/apps/Makefile \
 	src/apps/fisql/Makefile \
+	src/apps/unittests/Makefile \
 	freetds.spec \
 	win32/Makefile \
 	win32/freetds.nsh \

diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(unittests)
+
 set(libs ${lib_NETWORK} ${lib_BASE})
 
 foreach(target freebcp bsqldb defncopy datacopy)

diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS	= -I$(top_srcdir)/include 
 
-SUBDIRS		= fisql
+SUBDIRS		= fisql . unittests
 
 DIST_SUBDIRS	= $(SUBDIRS)