tdbc::odbc

Check-in [32b8054ab7]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Use tdbc_SRC_DIR from tdbcConfig.sh to locate genstubs tool, instead of hardcoded path.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | tdbcodbc-1-0-5
Files: files | file ages | folders
SHA1: 32b8054ab708b8f7a9ab834fb8e08a6db25c6ee2
User & Date: stu 2017-06-05 18:54:05
Context
2017-12-13
11:17
Merge vc-reform: new nmake build system check-in: f1c068bf57 user: apnadkarni tags: trunk
2017-12-10
16:13
Create new branch named "vc-reform" check-in: 333ab1c6da user: apnadkarni tags: vc-reform
2017-06-05
18:54
Use tdbc_SRC_DIR from tdbcConfig.sh to locate genstubs tool, instead of hardcoded path. check-in: 32b8054ab7 user: stu tags: trunk, tdbcodbc-1-0-5
16:22
Drop iodbc until we can deal with its different SQLCHAR size. check-in: 9daa1f819f user: stu tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in.

105
106
107
108
109
110
111

112
113
114
115
116
117
118
#TCL_DEFS	= @TCL_DEFS@
TCL_BIN_DIR	= @TCL_BIN_DIR@
TCL_SRC_DIR	= @TCL_SRC_DIR@
#TK_BIN_DIR	= @TK_BIN_DIR@
#TK_SRC_DIR	= @TK_SRC_DIR@

TDBC_VERSION	= @TDBC_VERSION@

TDBC_BIN_DIR	= @tdbc_BIN_DIR@
TDBC_LIB_FILE	= @TDBC_LIB_FILE@

# Not used, but retained for reference of what libs Tcl required
#TCL_LIBS	= @TCL_LIBS@

#========================================================================







>







105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
#TCL_DEFS	= @TCL_DEFS@
TCL_BIN_DIR	= @TCL_BIN_DIR@
TCL_SRC_DIR	= @TCL_SRC_DIR@
#TK_BIN_DIR	= @TK_BIN_DIR@
#TK_SRC_DIR	= @TK_SRC_DIR@

TDBC_VERSION	= @TDBC_VERSION@
TDBC_SRC_DIR	= @tdbc_SRC_DIR@
TDBC_BIN_DIR	= @tdbc_BIN_DIR@
TDBC_LIB_FILE	= @TDBC_LIB_FILE@

# Not used, but retained for reference of what libs Tcl required
#TCL_LIBS	= @TCL_LIBS@

#========================================================================
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389

	(cd $(DIST_ROOT); $(COMPRESS);)

#========================================================================
# How to rebuild the package's stub table.
#========================================================================

genstubs: $(srcdir)/../tdbc/tools/genExtStubs.tcl $(srcdir)/generic/odbcStubDefs.txt
	@echo $(TCLSH_PROGRAM) $(srcdir)/../tdbc/tools/genExtStubs.tcl \
		$(srcdir)/generic/odbcStubDefs.txt \
		$(srcdir)/generic/odbcStubs.h \
		$(srcdir)/generic/odbcStubInit.c
	@$(TCLSH) $(srcdir)/../tdbc/tools/genExtStubs.tcl \
		$(srcdir)/generic/odbcStubDefs.txt \
		$(srcdir)/generic/odbcStubs.h \
		$(srcdir)/generic/odbcStubInit.c

#========================================================================
# End of user-definable section
#========================================================================







|
|



|







371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390

	(cd $(DIST_ROOT); $(COMPRESS);)

#========================================================================
# How to rebuild the package's stub table.
#========================================================================

genstubs: $(TDBC_SRC_DIR)/tools/genExtStubs.tcl $(srcdir)/generic/odbcStubDefs.txt
	@echo $(TCLSH_PROGRAM) $(TDBC_SRC_DIR)/tools/genExtStubs.tcl \
		$(srcdir)/generic/odbcStubDefs.txt \
		$(srcdir)/generic/odbcStubs.h \
		$(srcdir)/generic/odbcStubInit.c
	@$(TCLSH) $(TDBC_SRC_DIR)/tools/genExtStubs.tcl \
		$(srcdir)/generic/odbcStubDefs.txt \
		$(srcdir)/generic/odbcStubs.h \
		$(srcdir)/generic/odbcStubInit.c

#========================================================================
# End of user-definable section
#========================================================================

Changes to configure.

3963
3964
3965
3966
3967
3968
3969

3970
3971
3972
3973
3974
3975
3976
$as_echo "$as_me: WARNING: Looking for \"${tdbc_BIN_DIR}/Makefile\"" >&2;}
if test -f "${tdbc_BIN_DIR}/Makefile" ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build include spec and lib specs for tdbc" >&5
$as_echo "$as_me: WARNING: Found Makefile - using build include spec and lib specs for tdbc" >&2;}
    tdbc_INCLUDE_SPEC=${tdbc_BUILD_INCLUDE_SPEC}
    tdbc_LIBRARY_PATH=${tdbc_BUILD_LIBRARY_PATH}
fi






#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.







>







3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
$as_echo "$as_me: WARNING: Looking for \"${tdbc_BIN_DIR}/Makefile\"" >&2;}
if test -f "${tdbc_BIN_DIR}/Makefile" ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build include spec and lib specs for tdbc" >&5
$as_echo "$as_me: WARNING: Found Makefile - using build include spec and lib specs for tdbc" >&2;}
    tdbc_INCLUDE_SPEC=${tdbc_BUILD_INCLUDE_SPEC}
    tdbc_LIBRARY_PATH=${tdbc_BUILD_LIBRARY_PATH}
fi






#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.

Changes to configure.ac.

62
63
64
65
66
67
68

69
70
71
72
73
74
75
if test -f "${tdbc_BIN_DIR}/Makefile" ; then
    AC_MSG_WARN([Found Makefile - using build include spec and lib specs for tdbc])
    tdbc_INCLUDE_SPEC=${tdbc_BUILD_INCLUDE_SPEC}
    tdbc_LIBRARY_PATH=${tdbc_BUILD_LIBRARY_PATH}
fi
AC_SUBST(tdbc_LIBRARY_PATH)
AC_SUBST(TDBC_VERSION)

AC_SUBST(tdbc_BIN_DIR)
AC_SUBST(TDBC_LIB_FILE)

#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.
# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
#-----------------------------------------------------------------------







>







62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
if test -f "${tdbc_BIN_DIR}/Makefile" ; then
    AC_MSG_WARN([Found Makefile - using build include spec and lib specs for tdbc])
    tdbc_INCLUDE_SPEC=${tdbc_BUILD_INCLUDE_SPEC}
    tdbc_LIBRARY_PATH=${tdbc_BUILD_LIBRARY_PATH}
fi
AC_SUBST(tdbc_LIBRARY_PATH)
AC_SUBST(TDBC_VERSION)
AC_SUBST(tdbc_SRC_DIR)
AC_SUBST(tdbc_BIN_DIR)
AC_SUBST(TDBC_LIB_FILE)

#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.
# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
#-----------------------------------------------------------------------