Fossil SCM

Merge in the Mistachkin SSL linking fix.

drh 2012-02-10 23:03 trunk merge
Commit f0635d4e034c2fba63d533c6327a27f44f25c218
Parent 75ea5ac672d7b31…
3 files changed +5 -4 +5 -4 +5 -4
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+5 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -359,20 +359,20 @@
359359
 #### The directories where the zlib include and library files are located.
360360
 # The recommended usage here is to use the Sysinternals junction tool
361361
 # to create a hard link between an "zlib-1.x.y" sub-directory of the
362362
 # Fossil source code directory and the target zlib source directory.
363363
 #
364
-ZINCDIR = $(SRCDIR)/../zlib-1.2.5
365
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
364
+ZINCDIR = $(SRCDIR)/../zlib-1.2.6
365
+ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
366366
367367
 #### The directories where the OpenSSL include and library files are located.
368368
 # The recommended usage here is to use the Sysinternals junction tool
369369
 # to create a hard link between an "openssl-1.x" sub-directory of the
370370
 # Fossil source code directory and the target OpenSSL source directory.
371371
 #
372
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
373
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
372
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
373
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
374374
375375
 #### Either the directory where the Tcl library is installed or the Tcl
376376
 # source code directory resides (depending on the value of the macro
377377
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
378378
 # this directory must have "include" and "lib" sub-directories. If
@@ -409,10 +409,11 @@
409409
 #
410410
 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
411411
412412
 # With HTTPS support
413413
 ifdef FOSSIL_ENABLE_SSL
414
+TCC += -Dpqueue_insert=pqueue_insert_fossil
414415
 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
415416
 endif
416417
417418
 # With Tcl support
418419
 ifdef FOSSIL_ENABLE_TCL
419420
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -359,20 +359,20 @@
359 #### The directories where the zlib include and library files are located.
360 # The recommended usage here is to use the Sysinternals junction tool
361 # to create a hard link between an "zlib-1.x.y" sub-directory of the
362 # Fossil source code directory and the target zlib source directory.
363 #
364 ZINCDIR = $(SRCDIR)/../zlib-1.2.5
365 ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
366
367 #### The directories where the OpenSSL include and library files are located.
368 # The recommended usage here is to use the Sysinternals junction tool
369 # to create a hard link between an "openssl-1.x" sub-directory of the
370 # Fossil source code directory and the target OpenSSL source directory.
371 #
372 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
373 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
374
375 #### Either the directory where the Tcl library is installed or the Tcl
376 # source code directory resides (depending on the value of the macro
377 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
378 # this directory must have "include" and "lib" sub-directories. If
@@ -409,10 +409,11 @@
409 #
410 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
411
412 # With HTTPS support
413 ifdef FOSSIL_ENABLE_SSL
 
414 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
415 endif
416
417 # With Tcl support
418 ifdef FOSSIL_ENABLE_TCL
419
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -359,20 +359,20 @@
359 #### The directories where the zlib include and library files are located.
360 # The recommended usage here is to use the Sysinternals junction tool
361 # to create a hard link between an "zlib-1.x.y" sub-directory of the
362 # Fossil source code directory and the target zlib source directory.
363 #
364 ZINCDIR = $(SRCDIR)/../zlib-1.2.6
365 ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
366
367 #### The directories where the OpenSSL include and library files are located.
368 # The recommended usage here is to use the Sysinternals junction tool
369 # to create a hard link between an "openssl-1.x" sub-directory of the
370 # Fossil source code directory and the target OpenSSL source directory.
371 #
372 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
373 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
374
375 #### Either the directory where the Tcl library is installed or the Tcl
376 # source code directory resides (depending on the value of the macro
377 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
378 # this directory must have "include" and "lib" sub-directories. If
@@ -409,10 +409,11 @@
409 #
410 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
411
412 # With HTTPS support
413 ifdef FOSSIL_ENABLE_SSL
414 TCC += -Dpqueue_insert=pqueue_insert_fossil
415 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
416 endif
417
418 # With Tcl support
419 ifdef FOSSIL_ENABLE_TCL
420
M win/Makefile.mingw
+5 -4
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -43,20 +43,20 @@
4343
 #### The directories where the zlib include and library files are located.
4444
 # The recommended usage here is to use the Sysinternals junction tool
4545
 # to create a hard link between an "zlib-1.x.y" sub-directory of the
4646
 # Fossil source code directory and the target zlib source directory.
4747
 #
48
-ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
48
+ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49
+ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
5050
5151
 #### The directories where the OpenSSL include and library files are located.
5252
 # The recommended usage here is to use the Sysinternals junction tool
5353
 # to create a hard link between an "openssl-1.x" sub-directory of the
5454
 # Fossil source code directory and the target OpenSSL source directory.
5555
 #
56
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
56
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
5858
5959
 #### Either the directory where the Tcl library is installed or the Tcl
6060
 # source code directory resides (depending on the value of the macro
6161
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
6262
 # this directory must have "include" and "lib" sub-directories. If
@@ -93,10 +93,11 @@
9393
 #
9494
 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
9595
9696
 # With HTTPS support
9797
 ifdef FOSSIL_ENABLE_SSL
98
+TCC += -Dpqueue_insert=pqueue_insert_fossil
9899
 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99100
 endif
100101
101102
 # With Tcl support
102103
 ifdef FOSSIL_ENABLE_TCL
103104
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
@@ -93,10 +93,11 @@
93 #
94 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96 # With HTTPS support
97 ifdef FOSSIL_ENABLE_SSL
 
98 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99 endif
100
101 # With Tcl support
102 ifdef FOSSIL_ENABLE_TCL
103
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
@@ -93,10 +93,11 @@
93 #
94 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96 # With HTTPS support
97 ifdef FOSSIL_ENABLE_SSL
98 TCC += -Dpqueue_insert=pqueue_insert_fossil
99 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
100 endif
101
102 # With Tcl support
103 ifdef FOSSIL_ENABLE_TCL
104
M win/Makefile.mingw.mistachkin
+5 -4
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -43,20 +43,20 @@
4343
 #### The directories where the zlib include and library files are located.
4444
 # The recommended usage here is to use the Sysinternals junction tool
4545
 # to create a hard link between an "zlib-1.x.y" sub-directory of the
4646
 # Fossil source code directory and the target zlib source directory.
4747
 #
48
-ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
48
+ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49
+ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
5050
5151
 #### The directories where the OpenSSL include and library files are located.
5252
 # The recommended usage here is to use the Sysinternals junction tool
5353
 # to create a hard link between an "openssl-1.x" sub-directory of the
5454
 # Fossil source code directory and the target OpenSSL source directory.
5555
 #
56
-OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57
-OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
56
+OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57
+OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
5858
5959
 #### Either the directory where the Tcl library is installed or the Tcl
6060
 # source code directory resides (depending on the value of the macro
6161
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
6262
 # this directory must have "include" and "lib" sub-directories. If
@@ -93,10 +93,11 @@
9393
 #
9494
 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
9595
9696
 # With HTTPS support
9797
 ifdef FOSSIL_ENABLE_SSL
98
+TCC += -Dpqueue_insert=pqueue_insert_fossil
9899
 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99100
 endif
100101
101102
 # With Tcl support
102103
 ifdef FOSSIL_ENABLE_TCL
103104
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.5
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.5
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
@@ -93,10 +93,11 @@
93 #
94 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96 # With HTTPS support
97 ifdef FOSSIL_ENABLE_SSL
 
98 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
99 endif
100
101 # With Tcl support
102 ifdef FOSSIL_ENABLE_TCL
103
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -43,20 +43,20 @@
43 #### The directories where the zlib include and library files are located.
44 # The recommended usage here is to use the Sysinternals junction tool
45 # to create a hard link between an "zlib-1.x.y" sub-directory of the
46 # Fossil source code directory and the target zlib source directory.
47 #
48 ZINCDIR = $(SRCDIR)/../zlib-1.2.6
49 ZLIBDIR = $(SRCDIR)/../zlib-1.2.6
50
51 #### The directories where the OpenSSL include and library files are located.
52 # The recommended usage here is to use the Sysinternals junction tool
53 # to create a hard link between an "openssl-1.x" sub-directory of the
54 # Fossil source code directory and the target OpenSSL source directory.
55 #
56 OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0g/include
57 OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0g
58
59 #### Either the directory where the Tcl library is installed or the Tcl
60 # source code directory resides (depending on the value of the macro
61 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
62 # this directory must have "include" and "lib" sub-directories. If
@@ -93,10 +93,11 @@
93 #
94 TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR)
95
96 # With HTTPS support
97 ifdef FOSSIL_ENABLE_SSL
98 TCC += -Dpqueue_insert=pqueue_insert_fossil
99 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
100 endif
101
102 # With Tcl support
103 ifdef FOSSIL_ENABLE_TCL
104

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button