Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Remove experimental lib loader. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
51215942e0109f19dae986950b7a7b03 |
User & Date: | stu 2018-07-04 10:16:39.173 |
Context
2018-07-11
| ||
20:39 | CONST -> const check-in: ed7550027c user: jan.nijtmans tags: trunk | |
2018-07-04
| ||
10:16 | Remove experimental lib loader. check-in: 51215942e0 user: stu tags: trunk | |
2018-07-01
| ||
05:19 | Don't try to dist install nonexistent files. check-in: 25210d9554 user: stu tags: trunk | |
Changes
Changes to configure.
︙ | ︙ | |||
2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 | # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tclconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ `ls -d /System/Library/Frameworks 2>/dev/null` \ ; do if test -f "$i/Tcl.framework/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`" break fi done fi | > > > | 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 | # on Darwin, check in Framework installation locations if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tclconfig}" = x ; then for i in `ls -d ~/Library/Frameworks 2>/dev/null` \ `ls -d /Library/Frameworks 2>/dev/null` \ `ls -d /Network/Library/Frameworks 2>/dev/null` \ `ls -d /System/Library/Frameworks 2>/dev/null` \ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Library/Frameworks/Tcl.framework 2>/dev/null` \ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/Network/Library/Frameworks/Tcl.framework 2>/dev/null` \ `ls -d /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Tcl.framework 2>/dev/null` \ ; do if test -f "$i/Tcl.framework/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`" break fi done fi |
︙ | ︙ | |||
2632 2633 2634 2635 2636 2637 2638 | fi # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then for i in `ls -d ${libdir} 2>/dev/null` \ `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ | < > | 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 | fi # check in a few common install locations if test x"${ac_cv_c_tclconfig}" = x ; then for i in `ls -d ${libdir} 2>/dev/null` \ `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib/tcl8.6 2>/dev/null` \ `ls -d /usr/lib/tcl8.5 2>/dev/null` \ `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ `ls -d /usr/local/lib/tcl8.5 2>/dev/null` \ |
︙ | ︙ | |||
3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 | # check in a few common install locations if test x"${ac_cv_c_tdbcconfig}" = x ; then for i in `ls -d ${libdir} 2>/dev/null` \ `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tdbcConfig.sh" ; then ac_cv_c_tdbcconfig=`(cd $i; pwd)` break fi | > | 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 | # check in a few common install locations if test x"${ac_cv_c_tdbcconfig}" = x ; then for i in `ls -d ${libdir} 2>/dev/null` \ `ls -d ${exec_prefix}/lib 2>/dev/null` \ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/pkg/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tdbcConfig.sh" ; then ac_cv_c_tdbcconfig=`(cd $i; pwd)` break fi |
︙ | ︙ | |||
5590 5591 5592 5593 5594 5595 5596 | if test ! -f "${srcdir}/$i" ; then as_fn_error $? "could not find tcl source file '${srcdir}/$i'" "$LINENO" 5 fi PKG_TCL_SOURCES="$PKG_TCL_SOURCES $i" done | < < < < < < < < < < | 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 5604 5605 5606 5607 | if test ! -f "${srcdir}/$i" ; then as_fn_error $? "could not find tcl source file '${srcdir}/$i'" "$LINENO" 5 fi PKG_TCL_SOURCES="$PKG_TCL_SOURCES $i" done #-------------------------------------------------------------------- # __CHANGE__ # # You can add more files to clean if your extension creates any extra # files by extending CLEANFILES. # Add pkgIndex.tcl if it is generated in the Makefile instead of ./configure |
︙ | ︙ |
Changes to configure.ac.
︙ | ︙ | |||
130 131 132 133 134 135 136 | else TEA_ADD_LIBS([${tdbc_STUB_LIB_SPEC}]) fi TEA_ADD_CFLAGS([${tdbc_CFLAGS}]) TEA_ADD_STUB_SOURCES() TEA_ADD_TCL_SOURCES([library/tdbcodbc.tcl]) | < < < < < < < | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | else TEA_ADD_LIBS([${tdbc_STUB_LIB_SPEC}]) fi TEA_ADD_CFLAGS([${tdbc_CFLAGS}]) TEA_ADD_STUB_SOURCES() TEA_ADD_TCL_SOURCES([library/tdbcodbc.tcl]) #-------------------------------------------------------------------- # __CHANGE__ # # You can add more files to clean if your extension creates any extra # files by extending CLEANFILES. # Add pkgIndex.tcl if it is generated in the Makefile instead of ./configure # and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var. |
︙ | ︙ |
Changes to generic/odbcStubInit.c.
︙ | ︙ | |||
25 26 27 28 29 30 31 | * Static data used in this file */ /* * Names of the libraries that might contain the ODBC API */ | < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | * Static data used in this file */ /* * Names of the libraries that might contain the ODBC API */ static const char *const odbcStubLibNames[] = { #if defined(__APPLE__) "libiodbc.2", #elif defined(__OpenBSD__) "libiodbc", #else "odbc32", "odbc", "libodbc32", "libodbc", "libiodbc", |
︙ | ︙ | |||
75 76 77 78 79 80 81 | "libiodbcinst", #else "odbccp", "odbccp32", "odbcinst", "libodbccp", "libodbccp32", "libodbcinst", "libiodbcinst", #endif NULL }; | < < < | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | "libiodbcinst", #else "odbccp", "odbccp32", "odbcinst", "libodbccp", "libodbccp32", "libodbcinst", "libiodbcinst", #endif NULL }; /* * Names of the functions that we need from ODBC */ static const char *const odbcSymbolNames[] = { /* @SYMNAMES@: DO NOT EDIT THESE NAMES */ |
︙ | ︙ | |||
138 139 140 141 142 143 144 | BOOL (INSTAPI* SQLConfigDataSourceW)(HWND, WORD, LPCWSTR, LPCWSTR) = NULL; BOOL (INSTAPI* SQLConfigDataSource)(HWND, WORD, LPCSTR, LPCSTR) = NULL; BOOL (INSTAPI* SQLInstallerError)(WORD, DWORD*, LPSTR, WORD, WORD*) = NULL; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | BOOL (INSTAPI* SQLConfigDataSourceW)(HWND, WORD, LPCWSTR, LPCWSTR) = NULL; BOOL (INSTAPI* SQLConfigDataSource)(HWND, WORD, LPCSTR, LPCSTR) = NULL; BOOL (INSTAPI* SQLInstallerError)(WORD, DWORD*, LPSTR, WORD, WORD*) = NULL; /* *----------------------------------------------------------------------------- * * OdbcInitStubs -- * * Initialize the Stubs table for the ODBC API * |
︙ | ︙ | |||
489 490 491 492 493 494 495 | */ Tcl_DecrRefCount(shlibext); if (status != TCL_OK) { return NULL; } return handle; } | < < | 208 209 210 211 212 213 214 | */ Tcl_DecrRefCount(shlibext); if (status != TCL_OK) { return NULL; } return handle; } |