TDBC

Changes On Branch rfe-b4029dc351
Login
Core Home Timeline Branches Tags Tickets Wiki
Hide Diff Patch Unified Diff

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

Changes In Branch rfe-b4029dc351 Excluding Merge-Ins

This is equivalent to a diff from 984d3bb3ef to 3afd48c9d8

2012-06-10
20:13
FRQ-b4029dc351: make all TDBC API functions MODULE_SCOPE check-in: e76f0d40b5 user: jan.nijtmans tags: trunk
2012-05-07
00:35
TIP 380 changes for tdbc::sqlite3 check-in: d0f6202d87 user: kennykb tags: trunk
2011-10-25
19:37
Make the layout of the tdbc build directory match the needs of the pkgIndex.tcl file. check-in: f68c8c7c81 user: dgp tags: bundle-fix
2011-10-14
07:49
RFE-b4029dc351: make all Tdbc API functions MODULE_SCOPE (So far only tested on Windows) Closed-Leaf check-in: 3afd48c9d8 user: jan.nijtmans tags: rfe-b4029dc351
2011-09-20
00:43
tdbcmysql: Add a 'valgrind' rule to the Makefile and change 'all.tcl' to facilitate 'valgrind' tdbcsqlite3: Fix a bug where a multi-SQL-statement 'statement' whose last result was empty would fail in 'allrows' or 'foreach'. check-in: 984d3bb3ef user: kennykb tags: trunk
2011-08-30
21:20
One round of leak hunting check-in: 472c643472 user: kennykb tags: trunk

Changes to tclooConfig.sh. 

1
2
3
4
5
6
7
8
9
10

# This is a dummy tclooConfig.sh file to fill in empty options
# when building against Tcl 8.6, which has tcloo in the coroe

TCLOO_LIB_SPEC=""
TCLOO_STUB_LIB_SPEC=""
TCLOO_INCLUDE_SPEC=""
# The next should copy TCL_PRIVATE_INCLUDE_SPEC, but I don't use it anyway.
TCLOO_PRIVATE_INCLUDE_SPEC=""
TCLOO_CFLAGS=-DUSE_TCLOO_STUBS
TCLOO_VERSION="8.6"









|


1
2
3
4
5
6
7
8
9
10

# This is a dummy tclooConfig.sh file to fill in empty options
# when building against Tcl 8.6, which has tcloo in the coroe

TCLOO_LIB_SPEC=""
TCLOO_STUB_LIB_SPEC=""
TCLOO_INCLUDE_SPEC=""
# The next should copy TCL_PRIVATE_INCLUDE_SPEC, but I don't use it anyway.
TCLOO_PRIVATE_INCLUDE_SPEC=""
TCLOO_CFLAGS=
TCLOO_VERSION="8.6"

Changes to tdbc/configure.

︙︙
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023

fi


fi


  else
    TCLOO_CFLAGS="-DUSE_TCLOO_STUBS"
  fi
fi
# Announce what versions of Tcl (and TclOO) are needed
TCL_VERSION_REQ=8.5;
TCL_VERSION_DESIRED=8.6;
TCLOO_VERSION_REQ=0.6;









|








2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023

fi


fi


  else
    TCLOO_CFLAGS=""
  fi
fi
# Announce what versions of Tcl (and TclOO) are needed
TCL_VERSION_REQ=8.5;
TCL_VERSION_DESIRED=8.6;
TCLOO_VERSION_REQ=0.6;
︙︙

Changes to tdbc/configure.in.

︙︙
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66

    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.5 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  if test "${TCL_MINOR_VERSION}" -eq 5 ; then
    TEA_PATH_CONFIG(tcloo)
    TEA_LOAD_CONFIG(tcloo)
  else
    TCLOO_CFLAGS="-DUSE_TCLOO_STUBS"
  fi
fi
# Announce what versions of Tcl (and TclOO) are needed
TCL_VERSION_REQ=8.5; AC_SUBST(TCL_VERSION_REQ)
TCL_VERSION_DESIRED=8.6; AC_SUBST(TCL_VERSION_DESIRED)
TCLOO_VERSION_REQ=0.6; AC_SUBST(TCLOO_VERSION_REQ)









|








52
53
54
55
56
57
58
59
60
61
62
63
64
65
66

    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.5 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  if test "${TCL_MINOR_VERSION}" -eq 5 ; then
    TEA_PATH_CONFIG(tcloo)
    TEA_LOAD_CONFIG(tcloo)
  else
    TCLOO_CFLAGS=""
  fi
fi
# Announce what versions of Tcl (and TclOO) are needed
TCL_VERSION_REQ=8.5; AC_SUBST(TCL_VERSION_REQ)
TCL_VERSION_DESIRED=8.6; AC_SUBST(TCL_VERSION_DESIRED)
TCLOO_VERSION_REQ=0.6; AC_SUBST(TCLOO_VERSION_REQ)
︙︙

Changes to tdbc/generic/tdbc.decls.

︙︙
17
18
19
20
21
22
23

24
25
26
27
28
29
30
31
32

library tdbc
interface tdbc
epoch 0
scspec TDBCAPI

# The public API for TDBC


declare 0 current {
    int Tdbc_Init(Tcl_Interp* interp)
}
declare 1 current {
    Tcl_Obj* Tdbc_TokenizeSql(Tcl_Interp* interp, const char* statement)
}
declare 2 current {
    const char* Tdbc_MapSqlState(const char* sqlstate)
}








>

|








17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33

library tdbc
interface tdbc
epoch 0
scspec TDBCAPI

# The public API for TDBC

# Just a dummy definition, meant to keep TDBC_STUBS_REVISION the same
declare 0 current {
    int Tdbc_Init_(Tcl_Interp* interp)
}
declare 1 current {
    Tcl_Obj* Tdbc_TokenizeSql(Tcl_Interp* interp, const char* statement)
}
declare 2 current {
    const char* Tdbc_MapSqlState(const char* sqlstate)
}

Changes to tdbc/generic/tdbc.h.

︙︙
14
15
16
17
18
19
20

21


22
23







24
25
26





27
28
29
30
31
32
33

 */

#ifndef TDBC_H_INCLUDED
#define TDBC_H_INCLUDED 1

#include <tcl.h>


#if defined(BUILD_tdbc)


#    define	TDBCAPI 	DLLEXPORT
#    undef	USE_TDBC_STUBS







#else
#    define	TDBCAPI		DLLIMPORT
#endif






/*
 * TDBC_VERSION and TDBC_PATCHLEVEL here must match the ones that
 * appear near the top of configure.in.
 */

#define	TDBC_VERSION	"1.0b17"








>
|
>
>
|
|
>
>
>
>
>
>
>

|

>
>
>
>
>








14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

 */

#ifndef TDBC_H_INCLUDED
#define TDBC_H_INCLUDED 1

#include <tcl.h>

#ifndef TDBCAPI
#   if defined(BUILD_tdbc)
#	define TDBCAPI MODULE_SCOPE
#   else
#	define TDBCAPI extern
#	undef USE_TDBC_STUBS
#	define USE_TDBC_STUBS 1
#   endif
#endif

#undef TCL_STORAGE_CLASS
#ifdef BUILD_tdbc
#   define TCL_STORAGE_CLASS DLLEXPORT
#else
#   define TCL_STORAGE_CLASS
#endif

EXTERN int		Tdbc_Init(Tcl_Interp *interp);

#undef TCL_STORAGE_CLASS
#define TCL_STORAGE_CLASS DLLIMPORT

/*
 * TDBC_VERSION and TDBC_PATCHLEVEL here must match the ones that
 * appear near the top of configure.in.
 */

#define	TDBC_VERSION	"1.0b17"
︙︙

Changes to tdbc/generic/tdbcDecls.h.

︙︙
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

 * this file, and for a DISCLAIMER OF ALL WARRANTIES.
 *
 * RCS: @(#) $Id$
 *
 */

#if defined(USE_TDBC_STUBS)
    extern const char* TdbcInitializeStubs(
        Tcl_Interp* interp, const char* version, int epoch, int revision);
#    define Tdbc_InitStubs(interp) \
        (TdbcInitializeStubs(interp, TDBC_VERSION, TDBC_STUBS_EPOCH,	\
                             TDBC_STUBS_REVISION))
#else
#    define Tdbc_InitStubs(interp) \
        (Tcl_PkgRequire(interp, "tdbc", TDBC_VERSION))








|








11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

 * this file, and for a DISCLAIMER OF ALL WARRANTIES.
 *
 * RCS: @(#) $Id$
 *
 */

#if defined(USE_TDBC_STUBS)
    TDBCAPI const char* TdbcInitializeStubs(
        Tcl_Interp* interp, const char* version, int epoch, int revision);
#    define Tdbc_InitStubs(interp) \
        (TdbcInitializeStubs(interp, TDBC_VERSION, TDBC_STUBS_EPOCH,	\
                             TDBC_STUBS_REVISION))
#else
#    define Tdbc_InitStubs(interp) \
        (Tcl_PkgRequire(interp, "tdbc", TDBC_VERSION))
︙︙
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

#if !defined(USE_TDBC_STUBS)

/*
 * Exported function declarations:
 */

/* 0 */
TDBCAPI int		Tdbc_Init (Tcl_Interp* interp);
/* 1 */
TDBCAPI Tcl_Obj*	Tdbc_TokenizeSql (Tcl_Interp* interp, 
				const char* statement);
/* 2 */
TDBCAPI const char*	Tdbc_MapSqlState (const char* sqlstate);

#endif /* !defined(USE_TDBC_STUBS) */

typedef struct TdbcStubs {
    int magic;
    int epoch;
    int revision;
    const struct TdbcStubHooks *hooks;

    int (*tdbc_Init) (Tcl_Interp* interp); /* 0 */
    Tcl_Obj* (*tdbc_TokenizeSql) (Tcl_Interp* interp, const char* statement); /* 1 */
    const char* (*tdbc_MapSqlState) (const char* sqlstate); /* 2 */
} TdbcStubs;

#ifdef __cplusplus
extern "C" {
#endif
extern const TdbcStubs *tdbcStubsPtr;
#ifdef __cplusplus
}
#endif

#if defined(USE_TDBC_STUBS)

/*
 * Inline function declarations:
 */

#ifndef Tdbc_Init
#define Tdbc_Init \
	(tdbcStubsPtr->tdbc_Init) /* 0 */
#endif
#ifndef Tdbc_TokenizeSql
#define Tdbc_TokenizeSql \
	(tdbcStubsPtr->tdbc_TokenizeSql) /* 1 */
#endif
#ifndef Tdbc_MapSqlState
#define Tdbc_MapSqlState \
	(tdbcStubsPtr->tdbc_MapSqlState) /* 2 */
#endif

#endif /* defined(USE_TDBC_STUBS) */

/* !END!: Do not edit above this line. */








|














|







|










|
|
|














33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

#if !defined(USE_TDBC_STUBS)

/*
 * Exported function declarations:
 */

/* 0 */
TDBCAPI int		Tdbc_Init_ (Tcl_Interp* interp);
/* 1 */
TDBCAPI Tcl_Obj*	Tdbc_TokenizeSql (Tcl_Interp* interp, 
				const char* statement);
/* 2 */
TDBCAPI const char*	Tdbc_MapSqlState (const char* sqlstate);

#endif /* !defined(USE_TDBC_STUBS) */

typedef struct TdbcStubs {
    int magic;
    int epoch;
    int revision;
    const struct TdbcStubHooks *hooks;

    int (*tdbc_Init_) (Tcl_Interp* interp); /* 0 */
    Tcl_Obj* (*tdbc_TokenizeSql) (Tcl_Interp* interp, const char* statement); /* 1 */
    const char* (*tdbc_MapSqlState) (const char* sqlstate); /* 2 */
} TdbcStubs;

#ifdef __cplusplus
extern "C" {
#endif
TDBCAPI const TdbcStubs *tdbcStubsPtr;
#ifdef __cplusplus
}
#endif

#if defined(USE_TDBC_STUBS)

/*
 * Inline function declarations:
 */

#ifndef Tdbc_Init_
#define Tdbc_Init_ \
	(tdbcStubsPtr->tdbc_Init_) /* 0 */
#endif
#ifndef Tdbc_TokenizeSql
#define Tdbc_TokenizeSql \
	(tdbcStubsPtr->tdbc_TokenizeSql) /* 1 */
#endif
#ifndef Tdbc_MapSqlState
#define Tdbc_MapSqlState \
	(tdbcStubsPtr->tdbc_MapSqlState) /* 2 */
#endif

#endif /* defined(USE_TDBC_STUBS) */

/* !END!: Do not edit above this line. */

Changes to tdbc/generic/tdbcStubInit.c.

︙︙
12
13
14
15
16
17
18


19
20
21
22
23
24
25
26
27
28
29
30
31
32

 * RCS: @(#) $Id$
 *
 */

#include "tdbcInt.h"

MODULE_SCOPE const TdbcStubs tdbcStubs;



/* !BEGIN!: Do not edit below this line. */

const TdbcStubs tdbcStubs = {
    TCL_STUB_MAGIC,
    TDBC_STUBS_EPOCH,
    TDBC_STUBS_REVISION,
    0,
    Tdbc_Init, /* 0 */
    Tdbc_TokenizeSql, /* 1 */
    Tdbc_MapSqlState, /* 2 */
};

/* !END!: Do not edit above this line. */








>
>








|






12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34

 * RCS: @(#) $Id$
 *
 */

#include "tdbcInt.h"

MODULE_SCOPE const TdbcStubs tdbcStubs;

#define Tdbc_Init_ Tdbc_Init

/* !BEGIN!: Do not edit below this line. */

const TdbcStubs tdbcStubs = {
    TCL_STUB_MAGIC,
    TDBC_STUBS_EPOCH,
    TDBC_STUBS_REVISION,
    0,
    Tdbc_Init_, /* 0 */
    Tdbc_TokenizeSql, /* 1 */
    Tdbc_MapSqlState, /* 2 */
};

/* !END!: Do not edit above this line. */

Changes to tdbc/generic/tdbcStubLib.c.

︙︙
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36

 */

#include <tcl.h>

#define USE_TDBC_STUBS 1
#include "tdbc.h"

/* 
 * 'extern' is the best scope that we can come up with for linking
 * tdbcStubsPtr.  We have no idea what linker scope a caller might
 * want for it. MODULE_SCOPE would be right, but we don't know even
 * whether the caller has the concept.
 */

extern const TdbcStubs *tdbcStubsPtr;
const TdbcStubs *tdbcStubsPtr = NULL;

/*
 *-----------------------------------------------------------------------------
 *
 * TdbcInitializeStubs --
 *








<
<
<
<
<
<
<
<








15
16
17
18
19
20
21








22
23
24
25
26
27
28

 */

#include <tcl.h>

#define USE_TDBC_STUBS 1
#include "tdbc.h"









const TdbcStubs *tdbcStubsPtr = NULL;

/*
 *-----------------------------------------------------------------------------
 *
 * TdbcInitializeStubs --
 *
︙︙

Changes to tdbc/tdbcConfig.sh.in.

︙︙
72
73
74
75
76
77
78
79
80
81

TDBC_LIBRARY_PATH="@tdbc_LIB_DIR@"

# Path name where .tcl files in the tdbc package appear at build time.
tdbc_BUILD_LIBRARY_PATH="@tdbc_SRC_DIR@/library"
TDBC_BUILD_LIBRARY_PATH="@tdbc_SRC_DIR@/library"

# Additional flags that must be passed to the C compiler to use tdbc
tdbc_CFLAGS=-DUSE_TDBC_STUBS
TDBC_CFLAGS=-DUSE_TDBC_STUBS









|
|


72
73
74
75
76
77
78
79
80
81

TDBC_LIBRARY_PATH="@tdbc_LIB_DIR@"

# Path name where .tcl files in the tdbc package appear at build time.
tdbc_BUILD_LIBRARY_PATH="@tdbc_SRC_DIR@/library"
TDBC_BUILD_LIBRARY_PATH="@tdbc_SRC_DIR@/library"

# Additional flags that must be passed to the C compiler to use tdbc
tdbc_CFLAGS=
TDBC_CFLAGS=

Changes to tdbc/tools/genStubs.tcl.

︙︙
675
676
677
678
679
680
681

682
683
684
685
686
687
688

#	None.

proc genStubs::emitHeader {name} {
    variable outDir
    variable hooks
    variable epoch
    variable revision


    set capName [string toupper [string index $name 0]]
    append capName [string range $name 1 end]

    set CAPName [string toupper $name]
    append text "\n"
    append text "#define ${CAPName}_STUBS_EPOCH $epoch\n"








>








675
676
677
678
679
680
681
682
683
684
685
686
687
688
689

#	None.

proc genStubs::emitHeader {name} {
    variable outDir
    variable hooks
    variable epoch
    variable revision
    variable scspec

    set capName [string toupper [string index $name 0]]
    append capName [string range $name 1 end]

    set CAPName [string toupper $name]
    append text "\n"
    append text "#define ${CAPName}_STUBS_EPOCH $epoch\n"
︙︙
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720

    append text "    const struct ${capName}StubHooks *hooks;\n\n"

    emitSlots $name text

    append text "} ${capName}Stubs;\n"

    append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
    append text "extern const ${capName}Stubs *${name}StubsPtr;\n"
    append text "#ifdef __cplusplus\n}\n#endif\n"

    emitMacros $name text

    rewriteFile [file join $outDir ${name}Decls.h] $text
    return
}








|








707
708
709
710
711
712
713
714
715
716
717
718
719
720
721

    append text "    const struct ${capName}StubHooks *hooks;\n\n"

    emitSlots $name text

    append text "} ${capName}Stubs;\n"

    append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
    append text "${scspec} const ${capName}Stubs *${name}StubsPtr;\n"
    append text "#ifdef __cplusplus\n}\n#endif\n"

    emitMacros $name text

    rewriteFile [file join $outDir ${name}Decls.h] $text
    return
}
︙︙
728
729
730
731
732
733
734
735
736
737
738

739
740
741
742
743
744
745
746
747
748
749
750
751
752













753
754
755
756
757
758
759
760

#	textVar		The variable to use for output.
#
# Results:
#	Returns the formatted output.

proc genStubs::emitInit {name textVar} {
    variable hooks
    variable epoch
    variable revision

    upvar $textVar text


    set capName [string toupper [string index $name 0]]
    append capName [string range $name 1 end]
    set CAPName [string toupper $name]

    if {[info exists hooks($name)]} {
 	append text "\nstatic const ${capName}StubHooks ${name}StubHooks = \{\n"
	set sep "    "
	foreach sub $hooks($name) {
	    append text $sep "&${sub}Stubs"
	    set sep ",\n    "
	}
	append text "\n\};\n"
    }













    append text "\nconst ${capName}Stubs ${name}Stubs = \{\n"
    append text "    TCL_STUB_MAGIC,\n"
    append text "    ${CAPName}_STUBS_EPOCH,\n"
    append text "    ${CAPName}_STUBS_REVISION,\n"
    if {[info exists hooks($name)]} {
	append text "    &${name}StubHooks,\n"
    } else {
	append text "    0,\n"








|
|
<

>














>
>
>
>
>
>
>
>
>
>
>
>
>
|








729
730
731
732
733
734
735
736
737

738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774

#	textVar		The variable to use for output.
#
# Results:
#	Returns the formatted output.

proc genStubs::emitInit {name textVar} {
    variable hooks
    variable interfaces
    variable epoch

    upvar $textVar text
    set root 1

    set capName [string toupper [string index $name 0]]
    append capName [string range $name 1 end]
    set CAPName [string toupper $name]

    if {[info exists hooks($name)]} {
 	append text "\nstatic const ${capName}StubHooks ${name}StubHooks = \{\n"
	set sep "    "
	foreach sub $hooks($name) {
	    append text $sep "&${sub}Stubs"
	    set sep ",\n    "
	}
	append text "\n\};\n"
    }
    foreach intf [array names interfaces] {
	if {[info exists hooks($intf)]} {
	    if {[lsearch -exact $hooks($intf) $name] >= 0} {
		set root 0
		break
	    }
	}
    }

    append text "\n"
    if {!$root} {
	append text "static "
    }
    append text "const ${capName}Stubs ${name}Stubs = \{\n"
    append text "    TCL_STUB_MAGIC,\n"
    append text "    ${CAPName}_STUBS_EPOCH,\n"
    append text "    ${CAPName}_STUBS_REVISION,\n"
    if {[info exists hooks($name)]} {
	append text "    &${name}StubHooks,\n"
    } else {
	append text "    0,\n"
︙︙

Changes to tdbcmysql/configure.

︙︙
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770

   if test "${TCL_MINOR_VERSION}" -lt 6 ; then
      { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&5
echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&2;}
   { (exit 1); exit 1; }; }
   fi
   TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
fi
TCL_VERSION_REQ=8.6;


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.








|








1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770

   if test "${TCL_MINOR_VERSION}" -lt 6 ; then
      { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&5
echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&2;}
   { (exit 1); exit 1; }; }
   fi
   TCLOO_CFLAGS=''
fi
TCL_VERSION_REQ=8.6;


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.
︙︙

Changes to tdbcmysql/configure.in.

︙︙
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67

Found configuration for Tcl ${TCL_VERSION}.])
fi
if test "${TCL_MAJOR_VERSION}" -eq 8 ; then
   if test "${TCL_MINOR_VERSION}" -lt 6 ; then
      AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
   fi
   TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
fi
TCL_VERSION_REQ=8.6; AC_SUBST(TCL_VERSION_REQ)

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)
# The next bit probably ought to be in TEA_LOAD_CONFIG
AC_MSG_WARN([Looking for "${tdbc_BIN_DIR}/Makefile"])








|








53
54
55
56
57
58
59
60
61
62
63
64
65
66
67

Found configuration for Tcl ${TCL_VERSION}.])
fi
if test "${TCL_MAJOR_VERSION}" -eq 8 ; then
   if test "${TCL_MINOR_VERSION}" -lt 6 ; then
      AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
   fi
   TCLOO_CFLAGS=''
fi
TCL_VERSION_REQ=8.6; AC_SUBST(TCL_VERSION_REQ)

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)
# The next bit probably ought to be in TEA_LOAD_CONFIG
AC_MSG_WARN([Looking for "${tdbc_BIN_DIR}/Makefile"])
︙︙

Changes to tdbcodbc/configure.

︙︙
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763

  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&5
echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&2;}
   { (exit 1); exit 1; }; }
  fi
  TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
fi
TCL_VERSION_REQ=8.6;


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.








|








1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763

  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&5
echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&2;}
   { (exit 1); exit 1; }; }
  fi
  TCLOO_CFLAGS=''
fi
TCL_VERSION_REQ=8.6;


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.
︙︙

Changes to tdbcodbc/configure.in.

︙︙
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

Found configuration for Tcl ${TCL_VERSION}.])
fi
if test "${TCL_MAJOR_VERSION}" -eq 8 ; then
  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
fi
TCL_VERSION_REQ=8.6; AC_SUBST(TCL_VERSION_REQ)

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)

# The next bit probably ought to be in TEA_LOAD_CONFIG








|








46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

Found configuration for Tcl ${TCL_VERSION}.])
fi
if test "${TCL_MAJOR_VERSION}" -eq 8 ; then
  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  TCLOO_CFLAGS=''
fi
TCL_VERSION_REQ=8.6; AC_SUBST(TCL_VERSION_REQ)

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)

# The next bit probably ought to be in TEA_LOAD_CONFIG
︙︙

Changes to tdbcoracle/Makefile.

︙︙
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158

#WISH   	= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)

SHARED_BUILD	= 1

INCLUDES	=  -I/usr/local/include -I/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/public -I"/usr/local/include" 
# INCLUDES	=  -I/usr/local/include -I/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/public -I"/usr/local/include" @TK_INCLUDES@ @TK_XINCLUDES@

PKG_CFLAGS	=  -DUSE_TCLOO_STUBS -DUSE_TDBC_STUBS

# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.in checks for the necessary components
# that your library may use.  TCL_DEFS can actually be a problem if
# you do not compile with a similar machine setup as the Tcl core was
# compiled with.
#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"tdbcoracle\" -DPACKAGE_TARNAME=\"tdbcoracle\" -DPACKAGE_VERSION=\"1.0b12\" -DPACKAGE_STRING=\"tdbcoracle\ 1.0b12\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_LONG_LONG=1 -DSIZEOF_LONG_LONG=8 -DSIZEOF_LONG=4 -DDONT_TD_VOID=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_OPEN64=1 -DHAVE_LSEEK64=1 -DHAVE_TYPE_OFF64_T=1 -DBUILD_tdbcoracle=1 -DUSE_TCL_STUBS=1 -DUSE_TK_STUBS=1 -DHAVE_OCI_H=1 $(PKG_CFLAGS)








|








144
145
146
147
148
149
150
151
152
153
154
155
156
157
158

#WISH   	= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)

SHARED_BUILD	= 1

INCLUDES	=  -I/usr/local/include -I/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/public -I"/usr/local/include" 
# INCLUDES	=  -I/usr/local/include -I/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/public -I"/usr/local/include" @TK_INCLUDES@ @TK_XINCLUDES@

PKG_CFLAGS	=  

# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.in checks for the necessary components
# that your library may use.  TCL_DEFS can actually be a problem if
# you do not compile with a similar machine setup as the Tcl core was
# compiled with.
#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"tdbcoracle\" -DPACKAGE_TARNAME=\"tdbcoracle\" -DPACKAGE_VERSION=\"1.0b12\" -DPACKAGE_STRING=\"tdbcoracle\ 1.0b12\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_LONG_LONG=1 -DSIZEOF_LONG_LONG=8 -DSIZEOF_LONG=4 -DDONT_TD_VOID=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_OPEN64=1 -DHAVE_LSEEK64=1 -DHAVE_TYPE_OFF64_T=1 -DBUILD_tdbcoracle=1 -DUSE_TCL_STUBS=1 -DUSE_TK_STUBS=1 -DHAVE_OCI_H=1 $(PKG_CFLAGS)
︙︙

Changes to tdbcoracle/configure.

︙︙
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017

fi


fi


  else
    TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
  fi
fi


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.








|








2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017

fi


fi


  else
    TCLOO_CFLAGS=''
  fi
fi


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.
︙︙

Changes to tdbcoracle/configure.in.

︙︙
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64

    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.5 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  if test "${TCL_MINOR_VERSION}" -eq 5 ; then
    TEA_PATH_CONFIG(tcloo)
    TEA_LOAD_CONFIG(tcloo)
  else
    TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
  fi
fi

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)

#-----------------------------------------------------------------------








|








50
51
52
53
54
55
56
57
58
59
60
61
62
63
64

    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.5 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  if test "${TCL_MINOR_VERSION}" -eq 5 ; then
    TEA_PATH_CONFIG(tcloo)
    TEA_LOAD_CONFIG(tcloo)
  else
    TCLOO_CFLAGS=''
  fi
fi

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)

#-----------------------------------------------------------------------
︙︙

Changes to tdbcpostgres/configure.

︙︙
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763

  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&5
echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&2;}
   { (exit 1); exit 1; }; }
  fi
  TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
fi
TCL_VERSION_REQ=8.6;


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.








|








1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763

  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&5
echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}." >&2;}
   { (exit 1); exit 1; }; }
  fi
  TCLOO_CFLAGS=''
fi
TCL_VERSION_REQ=8.6;


    #
    # Ok, lets find the tdbc configuration
    # First, look for one uninstalled.
︙︙

Changes to tdbcpostgres/configure.in.

︙︙
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

Found configuration for Tcl ${TCL_VERSION}.])
fi
if test "${TCL_MAJOR_VERSION}" -eq 8 ; then
  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  TCLOO_CFLAGS='-DUSE_TCLOO_STUBS'
fi
TCL_VERSION_REQ=8.6; AC_SUBST(TCL_VERSION_REQ)

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)
# The next bit probably ought to be in TEA_LOAD_CONFIG
AC_MSG_WARN([Looking for "${tdbc_BIN_DIR}/Makefile"])








|








46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

Found configuration for Tcl ${TCL_VERSION}.])
fi
if test "${TCL_MAJOR_VERSION}" -eq 8 ; then
  if test "${TCL_MINOR_VERSION}" -lt 6 ; then
    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6 or newer.
Found configuration for Tcl ${TCL_VERSION}.])
  fi
  TCLOO_CFLAGS=''
fi
TCL_VERSION_REQ=8.6; AC_SUBST(TCL_VERSION_REQ)

TEA_PATH_CONFIG(tdbc)
TEA_LOAD_CONFIG(tdbc)
# The next bit probably ought to be in TEA_LOAD_CONFIG
AC_MSG_WARN([Looking for "${tdbc_BIN_DIR}/Makefile"])
︙︙

This page was generated in about 0.086s by Fossil 2.24 [f4ffefe708] 2024-04-17 14:02:19