Fossil

Check-in [54307c4d]
Login

Check-in [54307c4d]

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

Overview
Comment:Fix use of linenoise. Fine-tune check for in-tree OpenSSL.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | mingwConfigure
Files: files | file ages | folders
SHA1: 54307c4d7d90c3d76ab0b4d72d28e4e5eda4e70d
User & Date: mistachkin 2016-01-16 22:25:14
Context
2016-01-16
22:51
Further refinements to permit OpenSSL in tree to work consistently. ... (check-in: 08918fab user: mistachkin tags: mingwConfigure)
22:25
Fix use of linenoise. Fine-tune check for in-tree OpenSSL. ... (check-in: 54307c4d user: mistachkin tags: mingwConfigure)
21:36
Sync up the 'makemake.tcl' tool. ... (check-in: 2c7eee4c user: mistachkin tags: mingwConfigure)
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile.in.
︙︙
38
39
40
41
42
43
44

45
46
47
48
49
50

#
TCLSH = tclsh

LIB =	@LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
TCCFLAGS =	@EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
INSTALLDIR = $(DESTDIR)@prefix@/bin
USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@

FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@

include $(SRCDIR)/main.mk

distclean: clean
	rm -f autoconfig.h config.log Makefile








>







38
39
40
41
42
43
44
45
46
47
48
49
50
51

#
TCLSH = tclsh

LIB =	@LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
TCCFLAGS =	@EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
INSTALLDIR = $(DESTDIR)@prefix@/bin
USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
USE_LINENOISE = @USE_LINENOISE@
FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@

include $(SRCDIR)/main.mk

distclean: clean
	rm -f autoconfig.h config.log Makefile
Changes to auto.def.
︙︙
239
240
241
242
243
244
245
246

247
248










249
250
251
252
253
254
255

    if {[is_mingw]} {
        lappend libs -lgdi32 -lwsock32
    }
    if {[info exists ::zlib_for_ssl]} {
        lappend libs $::zlib_for_ssl
    }
    msg-quiet cc-with [list -cflags $cflags -libs $libs] {
        if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} {

            incr rc
        }










    }
    if {$rc} {
        msg-result "ok"
        return 1
    } else {
        msg-result "no"
        return 0








|
>


>
>
>
>
>
>
>
>
>
>








239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266

    if {[is_mingw]} {
        lappend libs -lgdi32 -lwsock32
    }
    if {[info exists ::zlib_for_ssl]} {
        lappend libs $::zlib_for_ssl
    }
    msg-quiet cc-with [list -cflags $cflags -libs $libs] {
        if {[cc-check-includes openssl/ssl.h] && \
                [cc-check-functions SSL_new]} {
            incr rc
        }
    }
    if {!$rc && ![is_mingw]} {
        # On some systems, OpenSSL appears to require -ldl to link.
        lappend libs -ldl
        msg-quiet cc-with [list -cflags $cflags -libs $libs] {
            if {[cc-check-includes openssl/ssl.h] && \
                    [cc-check-functions SSL_new]} {
                incr rc
            }
        }
    }
    if {$rc} {
        msg-result "ok"
        return 1
    } else {
        msg-result "no"
        return 0
︙︙