Skip to content

Commit 17100bc

Browse files
committed
Merge updates to defncopy into Branch-1_4
2 parents 660c99e + 3585d56 commit 17100bc

File tree

7 files changed

+789
-103
lines changed

7 files changed

+789
-103
lines changed

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dnl ------------------------------------------------------------
1111
# ------------------------------------------------------------
1212
# Initialization
1313
# ------------------------------------------------------------
14-
AC_INIT(FreeTDS, 1.4.11)
14+
AC_INIT(FreeTDS, 1.4.12)
1515
AC_CONFIG_SRCDIR(src/dblib/dblib.c)
1616
AC_PREREQ(2.53)
1717

@@ -1003,6 +1003,7 @@ AC_CONFIG_FILES(include/freetds/version.h \
10031003
src/odbc/unittests/Makefile \
10041004
src/apps/Makefile \
10051005
src/apps/fisql/Makefile \
1006+
src/apps/unittests/Makefile \
10061007
freetds.spec \
10071008
win32/Makefile \
10081009
win32/freetds.nsh \

src/apps/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
add_subdirectory(unittests)
2+
13
set(libs ${lib_NETWORK} ${lib_BASE})
24

35
foreach(target freebcp bsqldb defncopy datacopy)

src/apps/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AM_CPPFLAGS = -I$(top_srcdir)/include
22

3-
SUBDIRS = fisql
3+
SUBDIRS = fisql . unittests
44

55
DIST_SUBDIRS = $(SUBDIRS)
66

0 commit comments

Comments
 (0)