OLD | NEW |
1 # | 1 # |
2 # The build process allows for using a cross-compiler. But the default | 2 # The build process allows for using a cross-compiler. But the default |
3 # action is to target the same platform that we are running on. The | 3 # action is to target the same platform that we are running on. The |
4 # configure script needs to discover the following properties of the | 4 # configure script needs to discover the following properties of the |
5 # build and target systems: | 5 # build and target systems: |
6 # | 6 # |
7 # srcdir | 7 # srcdir |
8 # | 8 # |
9 # The is the name of the directory that contains the | 9 # The is the name of the directory that contains the |
10 # "configure" shell script. All source files are | 10 # "configure" shell script. All source files are |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 ######### | 132 ######### |
133 # By default, we use the amalgamation (this may be changed below...) | 133 # By default, we use the amalgamation (this may be changed below...) |
134 # | 134 # |
135 USE_AMALGAMATION=1 | 135 USE_AMALGAMATION=1 |
136 | 136 |
137 ######### | 137 ######### |
138 # See whether we can run specific tclsh versions known to work well; | 138 # See whether we can run specific tclsh versions known to work well; |
139 # if not, then we fall back to plain tclsh. | 139 # if not, then we fall back to plain tclsh. |
140 # TODO: try other versions before falling back? | 140 # TODO: try other versions before falling back? |
141 # | 141 # |
142 AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.4 tclsh], none) | 142 AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.5 tclsh], none) |
143 if test "$TCLSH_CMD" = "none"; then | 143 if test "$TCLSH_CMD" = "none"; then |
144 # If we can't find a local tclsh, then building the amalgamation will fail. | 144 # If we can't find a local tclsh, then building the amalgamation will fail. |
145 # We act as though --disable-amalgamation has been used. | 145 # We act as though --disable-amalgamation has been used. |
146 echo "Warning: can't find tclsh - defaulting to non-amalgamation build." | 146 echo "Warning: can't find tclsh - defaulting to non-amalgamation build." |
147 USE_AMALGAMATION=0 | 147 USE_AMALGAMATION=0 |
148 TCLSH_CMD="tclsh" | 148 TCLSH_CMD="tclsh" |
149 fi | 149 fi |
150 AC_SUBST(TCLSH_CMD) | 150 AC_SUBST(TCLSH_CMD) |
151 | 151 |
152 AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin]) | 152 AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin]) |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 AC_CONFIG_HEADERS(config.h) | 710 AC_CONFIG_HEADERS(config.h) |
711 | 711 |
712 ######### | 712 ######### |
713 # Generate the output files. | 713 # Generate the output files. |
714 # | 714 # |
715 AC_SUBST(BUILD_CFLAGS) | 715 AC_SUBST(BUILD_CFLAGS) |
716 AC_OUTPUT([ | 716 AC_OUTPUT([ |
717 Makefile | 717 Makefile |
718 sqlite3.pc | 718 sqlite3.pc |
719 ]) | 719 ]) |
OLD | NEW |