Fossil SCM
Change -DHAVE_LINENOISE to -DHAVE_LINENOISE=2 to account for a pending upstream change in extsrc/shell.c.
Commit
be78b70f8746252a9949e0c757e982c443914d97801fb6ab72e7e802388aa479
Parent
7253b15a53aae9f…
2 files changed
+1
-1
+1
-1
+1
-1
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -704,11 +704,11 @@ | ||
| 704 | 704 | |
| 705 | 705 | # The USE_LINENOISE variable may be undefined, set to 0, or set |
| 706 | 706 | # to 1. If it is set to 0, then there is no need to build or link |
| 707 | 707 | # the linenoise.o object. |
| 708 | 708 | LINENOISE_DEF.0 = |
| 709 | -LINENOISE_DEF.1 = -DHAVE_LINENOISE | |
| 709 | +LINENOISE_DEF.1 = -DHAVE_LINENOISE=2 | |
| 710 | 710 | LINENOISE_DEF. = $(LINENOISE_DEF.0) |
| 711 | 711 | LINENOISE_OBJ.0 = |
| 712 | 712 | LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o |
| 713 | 713 | LINENOISE_OBJ. = $(LINENOISE_OBJ.0) |
| 714 | 714 | |
| 715 | 715 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -704,11 +704,11 @@ | |
| 704 | |
| 705 | # The USE_LINENOISE variable may be undefined, set to 0, or set |
| 706 | # to 1. If it is set to 0, then there is no need to build or link |
| 707 | # the linenoise.o object. |
| 708 | LINENOISE_DEF.0 = |
| 709 | LINENOISE_DEF.1 = -DHAVE_LINENOISE |
| 710 | LINENOISE_DEF. = $(LINENOISE_DEF.0) |
| 711 | LINENOISE_OBJ.0 = |
| 712 | LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o |
| 713 | LINENOISE_OBJ. = $(LINENOISE_OBJ.0) |
| 714 | |
| 715 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -704,11 +704,11 @@ | |
| 704 | |
| 705 | # The USE_LINENOISE variable may be undefined, set to 0, or set |
| 706 | # to 1. If it is set to 0, then there is no need to build or link |
| 707 | # the linenoise.o object. |
| 708 | LINENOISE_DEF.0 = |
| 709 | LINENOISE_DEF.1 = -DHAVE_LINENOISE=2 |
| 710 | LINENOISE_DEF. = $(LINENOISE_DEF.0) |
| 711 | LINENOISE_OBJ.0 = |
| 712 | LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o |
| 713 | LINENOISE_OBJ. = $(LINENOISE_OBJ.0) |
| 714 | |
| 715 |
+1
-1
| --- tools/makemake.tcl | ||
| +++ tools/makemake.tcl | ||
| @@ -445,11 +445,11 @@ | ||
| 445 | 445 | |
| 446 | 446 | # The USE_LINENOISE variable may be undefined, set to 0, or set |
| 447 | 447 | # to 1. If it is set to 0, then there is no need to build or link |
| 448 | 448 | # the linenoise.o object. |
| 449 | 449 | LINENOISE_DEF.0 = |
| 450 | -LINENOISE_DEF.1 = -DHAVE_LINENOISE | |
| 450 | +LINENOISE_DEF.1 = -DHAVE_LINENOISE=2 | |
| 451 | 451 | LINENOISE_DEF. = $(LINENOISE_DEF.0) |
| 452 | 452 | LINENOISE_OBJ.0 = |
| 453 | 453 | LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o |
| 454 | 454 | LINENOISE_OBJ. = $(LINENOISE_OBJ.0) |
| 455 | 455 | |
| 456 | 456 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -445,11 +445,11 @@ | |
| 445 | |
| 446 | # The USE_LINENOISE variable may be undefined, set to 0, or set |
| 447 | # to 1. If it is set to 0, then there is no need to build or link |
| 448 | # the linenoise.o object. |
| 449 | LINENOISE_DEF.0 = |
| 450 | LINENOISE_DEF.1 = -DHAVE_LINENOISE |
| 451 | LINENOISE_DEF. = $(LINENOISE_DEF.0) |
| 452 | LINENOISE_OBJ.0 = |
| 453 | LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o |
| 454 | LINENOISE_OBJ. = $(LINENOISE_OBJ.0) |
| 455 | |
| 456 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -445,11 +445,11 @@ | |
| 445 | |
| 446 | # The USE_LINENOISE variable may be undefined, set to 0, or set |
| 447 | # to 1. If it is set to 0, then there is no need to build or link |
| 448 | # the linenoise.o object. |
| 449 | LINENOISE_DEF.0 = |
| 450 | LINENOISE_DEF.1 = -DHAVE_LINENOISE=2 |
| 451 | LINENOISE_DEF. = $(LINENOISE_DEF.0) |
| 452 | LINENOISE_OBJ.0 = |
| 453 | LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o |
| 454 | LINENOISE_OBJ. = $(LINENOISE_OBJ.0) |
| 455 | |
| 456 |