Fossil SCM
Fix use of linenoise. Fine-tune check for in-tree OpenSSL.
Commit
54307c4d7d90c3d76ab0b4d72d28e4e5eda4e70d
Parent
2c7eee4c9a5550b…
2 files changed
+1
+12
-1
+1
| --- Makefile.in | ||
| +++ Makefile.in | ||
| @@ -40,10 +40,11 @@ | ||
| 40 | 40 | |
| 41 | 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | 42 | TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H |
| 43 | 43 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | 44 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | +USE_LINENOISE = @USE_LINENOISE@ | |
| 45 | 46 | FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@ |
| 46 | 47 | |
| 47 | 48 | include $(SRCDIR)/main.mk |
| 48 | 49 | |
| 49 | 50 | distclean: clean |
| 50 | 51 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -40,10 +40,11 @@ | |
| 40 | |
| 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H |
| 43 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@ |
| 46 | |
| 47 | include $(SRCDIR)/main.mk |
| 48 | |
| 49 | distclean: clean |
| 50 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -40,10 +40,11 @@ | |
| 40 | |
| 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H |
| 43 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | USE_LINENOISE = @USE_LINENOISE@ |
| 46 | FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@ |
| 47 | |
| 48 | include $(SRCDIR)/main.mk |
| 49 | |
| 50 | distclean: clean |
| 51 |
M
auto.def
+12
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -241,13 +241,24 @@ | ||
| 241 | 241 | } |
| 242 | 242 | if {[info exists ::zlib_for_ssl]} { |
| 243 | 243 | lappend libs $::zlib_for_ssl |
| 244 | 244 | } |
| 245 | 245 | msg-quiet cc-with [list -cflags $cflags -libs $libs] { |
| 246 | - if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} { | |
| 246 | + if {[cc-check-includes openssl/ssl.h] && \ | |
| 247 | + [cc-check-functions SSL_new]} { | |
| 247 | 248 | incr rc |
| 248 | 249 | } |
| 250 | + } | |
| 251 | + if {!$rc && ![is_mingw]} { | |
| 252 | + # On some systems, OpenSSL appears to require -ldl to link. | |
| 253 | + lappend libs -ldl | |
| 254 | + msg-quiet cc-with [list -cflags $cflags -libs $libs] { | |
| 255 | + if {[cc-check-includes openssl/ssl.h] && \ | |
| 256 | + [cc-check-functions SSL_new]} { | |
| 257 | + incr rc | |
| 258 | + } | |
| 259 | + } | |
| 249 | 260 | } |
| 250 | 261 | if {$rc} { |
| 251 | 262 | msg-result "ok" |
| 252 | 263 | return 1 |
| 253 | 264 | } else { |
| 254 | 265 |
| --- auto.def | |
| +++ auto.def | |
| @@ -241,13 +241,24 @@ | |
| 241 | } |
| 242 | if {[info exists ::zlib_for_ssl]} { |
| 243 | lappend libs $::zlib_for_ssl |
| 244 | } |
| 245 | msg-quiet cc-with [list -cflags $cflags -libs $libs] { |
| 246 | if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} { |
| 247 | incr rc |
| 248 | } |
| 249 | } |
| 250 | if {$rc} { |
| 251 | msg-result "ok" |
| 252 | return 1 |
| 253 | } else { |
| 254 |
| --- auto.def | |
| +++ auto.def | |
| @@ -241,13 +241,24 @@ | |
| 241 | } |
| 242 | if {[info exists ::zlib_for_ssl]} { |
| 243 | lappend libs $::zlib_for_ssl |
| 244 | } |
| 245 | msg-quiet cc-with [list -cflags $cflags -libs $libs] { |
| 246 | if {[cc-check-includes openssl/ssl.h] && \ |
| 247 | [cc-check-functions SSL_new]} { |
| 248 | incr rc |
| 249 | } |
| 250 | } |
| 251 | if {!$rc && ![is_mingw]} { |
| 252 | # On some systems, OpenSSL appears to require -ldl to link. |
| 253 | lappend libs -ldl |
| 254 | msg-quiet cc-with [list -cflags $cflags -libs $libs] { |
| 255 | if {[cc-check-includes openssl/ssl.h] && \ |
| 256 | [cc-check-functions SSL_new]} { |
| 257 | incr rc |
| 258 | } |
| 259 | } |
| 260 | } |
| 261 | if {$rc} { |
| 262 | msg-result "ok" |
| 263 | return 1 |
| 264 | } else { |
| 265 |