Fossil SCM
Added missing -nocomplain flag to a glob command call to avoid configure dying if it cannot find libsqlite*.
Commit
5e2dbcc6fe611bf5868b5c88f4eb530b07dfc4cb3152520cb7afa36566285d7b
Parent
258479650bdfdb6…
1 file changed
+1
-1
M
auto.def
+1
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -491,11 +491,11 @@ | ||
| 491 | 491 | define SQLITE3_OBJ.2 $sq3path/sqlite3.o |
| 492 | 492 | define-append CFLAGS_INCLUDE -I$sq3path |
| 493 | 493 | define-append EXTRA_LDFLAGS $sq3path/sqlite3.o -lpthread |
| 494 | 494 | # ^^^ additional -lXXX flags are conservative estimates |
| 495 | 495 | msg-result "Using sqlite3.o from $sq3path" |
| 496 | - } elseif { ([llength [glob -directory $sq3path/lib libsqlite3*]] != 0) \ | |
| 496 | + } elseif { ([llength [glob -nocomplain -directory $sq3path/lib libsqlite3*]] != 0) \ | |
| 497 | 497 | && ([file exists $sq3path/include/sqlite3.h]) } { |
| 498 | 498 | # e.g. --with-sqlite=/usr/local. Try $sq3path/lib/libsqlite3* |
| 499 | 499 | # and $sq3path/include/sqlite3.h |
| 500 | 500 | define-append CFLAGS_INCLUDE -I$sq3path/include |
| 501 | 501 | define-append EXTRA_LDFLAGS -L$sq3path/lib -lsqlite3 -lpthread |
| 502 | 502 |
| --- auto.def | |
| +++ auto.def | |
| @@ -491,11 +491,11 @@ | |
| 491 | define SQLITE3_OBJ.2 $sq3path/sqlite3.o |
| 492 | define-append CFLAGS_INCLUDE -I$sq3path |
| 493 | define-append EXTRA_LDFLAGS $sq3path/sqlite3.o -lpthread |
| 494 | # ^^^ additional -lXXX flags are conservative estimates |
| 495 | msg-result "Using sqlite3.o from $sq3path" |
| 496 | } elseif { ([llength [glob -directory $sq3path/lib libsqlite3*]] != 0) \ |
| 497 | && ([file exists $sq3path/include/sqlite3.h]) } { |
| 498 | # e.g. --with-sqlite=/usr/local. Try $sq3path/lib/libsqlite3* |
| 499 | # and $sq3path/include/sqlite3.h |
| 500 | define-append CFLAGS_INCLUDE -I$sq3path/include |
| 501 | define-append EXTRA_LDFLAGS -L$sq3path/lib -lsqlite3 -lpthread |
| 502 |
| --- auto.def | |
| +++ auto.def | |
| @@ -491,11 +491,11 @@ | |
| 491 | define SQLITE3_OBJ.2 $sq3path/sqlite3.o |
| 492 | define-append CFLAGS_INCLUDE -I$sq3path |
| 493 | define-append EXTRA_LDFLAGS $sq3path/sqlite3.o -lpthread |
| 494 | # ^^^ additional -lXXX flags are conservative estimates |
| 495 | msg-result "Using sqlite3.o from $sq3path" |
| 496 | } elseif { ([llength [glob -nocomplain -directory $sq3path/lib libsqlite3*]] != 0) \ |
| 497 | && ([file exists $sq3path/include/sqlite3.h]) } { |
| 498 | # e.g. --with-sqlite=/usr/local. Try $sq3path/lib/libsqlite3* |
| 499 | # and $sq3path/include/sqlite3.h |
| 500 | define-append CFLAGS_INCLUDE -I$sq3path/include |
| 501 | define-append EXTRA_LDFLAGS -L$sq3path/lib -lsqlite3 -lpthread |
| 502 |