SQLite

Check-in [3032cc2b88]
Login

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

Overview
Comment:Improvements to the --help option to configure. Ticket #1033. (CVS 2161)
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 3032cc2b88800e7226e6fab8f5ca7a7e8dbac36e
User & Date: drh 2004-12-10 02:20:28.000
Context
2004-12-10
03:08
Back out the USE_TCL_STUBS changes because it breaks the build. I think the strategy needs to be to abandon libtool and use tcl.m4 to figure out how to build our own shared libraries. Ticket #1034. (CVS 2162) (check-in: 7f4679b92e user: drh tags: trunk)
02:20
Improvements to the --help option to configure. Ticket #1033. (CVS 2161) (check-in: 3032cc2b88 user: drh tags: trunk)
02:08
Add a -DUSE_TCL_STUBS to the standard Makefile. This might help with ticket #1034. Or maybe not. (CVS 2160) (check-in: 4c30c373ef user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to configure.
︙︙
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049

  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
  --with-pic              try to use only PIC/non-PIC objects [default=use
                          both]
  --with-tags[=TAGS]
                          include additional configurations [automatic]
  --with-hints=FILE       Read configuration options from FILE
  --with-tcl              directory containing tcl configuration (tclConfig.sh)

Some influential environment variables:
  CC          C compiler command
  CFLAGS      C compiler flags
  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
              nonstandard directory <lib dir>
  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have








|








1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049

  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
  --with-pic              try to use only PIC/non-PIC objects [default=use
                          both]
  --with-tags[=TAGS]
                          include additional configurations [automatic]
  --with-hints=FILE       Read configuration options from FILE
  --with-tcl=DIR          directory containing tcl configuration (tclConfig.sh)

Some influential environment variables:
  CC          C compiler command
  CFLAGS      C compiler flags
  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
              nonstandard directory <lib dir>
  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
︙︙
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505







# The following RCS revision string applies to configure.in
# $Revision: 1.27 $

#########
# Programs needed
#
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
  enableval="$enable_shared"








|








1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505







# The following RCS revision string applies to configure.in
# $Revision: 1.28 $

#########
# Programs needed
#
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
  enableval="$enable_shared"
︙︙
Changes to configure.ac.
︙︙
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126

# the corresponding code.
#
AC_INIT(src/sqlite.h.in)

dnl Put the RCS revision string after AC_INIT so that it will also
dnl show in in configure.
# The following RCS revision string applies to configure.in
# $Revision: 1.13 $

#########
# Programs needed
#
AC_PROG_LIBTOOL
AC_PROG_INSTALL









|








112
113
114
115
116
117
118
119
120
121
122
123
124
125
126

# the corresponding code.
#
AC_INIT(src/sqlite.h.in)

dnl Put the RCS revision string after AC_INIT so that it will also
dnl show in in configure.
# The following RCS revision string applies to configure.in
# $Revision: 1.14 $

#########
# Programs needed
#
AC_PROG_LIBTOOL
AC_PROG_INSTALL
︙︙
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409

# macros in the in the tcl.m4 file of the standard TCL distribution.
# Those macros could not be used directly since we have to make some
# minor changes to accomodate systems that do not have TCL installed.
#
AC_ARG_ENABLE(tcl, [  --disable-tcl       do not build TCL extension],
      [use_tcl=$enableval],[use_tcl=yes])
if test "${use_tcl}" = "yes" ; then
  AC_ARG_WITH(tcl, [  --with-tcl              directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval})
  AC_MSG_CHECKING([for Tcl configuration])
  AC_CACHE_VAL(ac_cv_c_tclconfig,[
    # First check to see if --with-tcl was specified.
    if test x"${with_tclconfig}" != x ; then
      if test -f "${with_tclconfig}/tclConfig.sh" ; then
        ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
      else








|








395
396
397
398
399
400
401
402
403
404
405
406
407
408
409

# macros in the in the tcl.m4 file of the standard TCL distribution.
# Those macros could not be used directly since we have to make some
# minor changes to accomodate systems that do not have TCL installed.
#
AC_ARG_ENABLE(tcl, [  --disable-tcl       do not build TCL extension],
      [use_tcl=$enableval],[use_tcl=yes])
if test "${use_tcl}" = "yes" ; then
  AC_ARG_WITH(tcl, [  --with-tcl=DIR          directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval})
  AC_MSG_CHECKING([for Tcl configuration])
  AC_CACHE_VAL(ac_cv_c_tclconfig,[
    # First check to see if --with-tcl was specified.
    if test x"${with_tclconfig}" != x ; then
      if test -f "${with_tclconfig}/tclConfig.sh" ; then
        ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
      else
︙︙