Fossil SCM
Remove @FOSSIL_ENABLE_TCL@ references in Makefile*.in: It doesn't work when tcl is not enabled, and it has no function anyway because the definition in autoconfig.h is really what matters.
Commit
d77b7ed1a0a83427fb8ac5b4b47caee11262f9a9
Parent
c3d09540dd26883…
2 files changed
+1
-4
-3
+1
-4
| --- Makefile.Cygwin.in | ||
| +++ Makefile.Cygwin.in | ||
| @@ -36,16 +36,13 @@ | ||
| 36 | 36 | # care about testing the end result, this can be blank. |
| 37 | 37 | # |
| 38 | 38 | TCLSH = tclsh |
| 39 | 39 | |
| 40 | 40 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 41 | -TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -DFOSSIL_OMIT_LOAD_AVERAGE | |
| 41 | +TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H | |
| 42 | 42 | INSTALLDIR =$(DESTDIR)@prefix@/bin |
| 43 | 43 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 44 | -FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@ | |
| 45 | -FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@ | |
| 46 | -FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@ | |
| 47 | 44 | SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI |
| 48 | 45 | SQLITE_CFLAGS += -DSQLITE_WIN32_MAX_PATH_BYTES=4096 |
| 49 | 46 | SQLITE_CFLAGS += -DSQLITE_MAX_MMAP_SIZE=0x7fff0000 |
| 50 | 47 | |
| 51 | 48 | include $(SRCDIR)/main.mk |
| 52 | 49 |
| --- Makefile.Cygwin.in | |
| +++ Makefile.Cygwin.in | |
| @@ -36,16 +36,13 @@ | |
| 36 | # care about testing the end result, this can be blank. |
| 37 | # |
| 38 | TCLSH = tclsh |
| 39 | |
| 40 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 41 | TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -DFOSSIL_OMIT_LOAD_AVERAGE |
| 42 | INSTALLDIR =$(DESTDIR)@prefix@/bin |
| 43 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 44 | FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@ |
| 45 | FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@ |
| 46 | FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@ |
| 47 | SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI |
| 48 | SQLITE_CFLAGS += -DSQLITE_WIN32_MAX_PATH_BYTES=4096 |
| 49 | SQLITE_CFLAGS += -DSQLITE_MAX_MMAP_SIZE=0x7fff0000 |
| 50 | |
| 51 | include $(SRCDIR)/main.mk |
| 52 |
| --- Makefile.Cygwin.in | |
| +++ Makefile.Cygwin.in | |
| @@ -36,16 +36,13 @@ | |
| 36 | # care about testing the end result, this can be blank. |
| 37 | # |
| 38 | TCLSH = tclsh |
| 39 | |
| 40 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 41 | TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H |
| 42 | INSTALLDIR =$(DESTDIR)@prefix@/bin |
| 43 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 44 | SQLITE_CFLAGS += -DSQLITE_WIN32_NO_ANSI |
| 45 | SQLITE_CFLAGS += -DSQLITE_WIN32_MAX_PATH_BYTES=4096 |
| 46 | SQLITE_CFLAGS += -DSQLITE_MAX_MMAP_SIZE=0x7fff0000 |
| 47 | |
| 48 | include $(SRCDIR)/main.mk |
| 49 |
-3
| --- Makefile.in | ||
| +++ Makefile.in | ||
| @@ -40,13 +40,10 @@ | ||
| 40 | 40 | |
| 41 | 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | 42 | TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H |
| 43 | 43 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | 44 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | -FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@ | |
| 46 | -FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@ | |
| 47 | -FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@ | |
| 48 | 45 | |
| 49 | 46 | include $(SRCDIR)/main.mk |
| 50 | 47 | |
| 51 | 48 | distclean: clean |
| 52 | 49 | rm -f autoconfig.h config.log Makefile |
| 53 | 50 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -40,13 +40,10 @@ | |
| 40 | |
| 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H |
| 43 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@ |
| 46 | FOSSIL_ENABLE_TCL_STUBS = @FOSSIL_ENABLE_TCL_STUBS@ |
| 47 | FOSSIL_ENABLE_TCL_PRIVATE_STUBS = @FOSSIL_ENABLE_TCL_PRIVATE_STUBS@ |
| 48 | |
| 49 | include $(SRCDIR)/main.mk |
| 50 | |
| 51 | distclean: clean |
| 52 | rm -f autoconfig.h config.log Makefile |
| 53 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -40,13 +40,10 @@ | |
| 40 | |
| 41 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 42 | TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H |
| 43 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 44 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 45 | |
| 46 | include $(SRCDIR)/main.mk |
| 47 | |
| 48 | distclean: clean |
| 49 | rm -f autoconfig.h config.log Makefile |
| 50 |