Fossil SCM

Update referenced OpenSSL version.

jan.nijtmans 2014-08-07 10:12 trunk
Commit 3a934617388aa515d85f92745636c94f213c132e
Parent 4e18dba698479a2…
4 files changed +4 -4 +2 -2 +2 -2 +2 -2
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+4 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -456,12 +456,12 @@
456456
 #### The directories where the OpenSSL include and library files are located.
457457
 # The recommended usage here is to use the Sysinternals junction tool
458458
 # to create a hard link between an "openssl-1.x" sub-directory of the
459459
 # Fossil source code directory and the target OpenSSL source directory.
460460
 #
461
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
462
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
461
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include
462
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i
463463
464464
 #### Either the directory where the Tcl library is installed or the Tcl
465465
 # source code directory resides (depending on the value of the macro
466466
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
467467
 # this directory must have "include" and "lib" sub-directories. If
@@ -1057,12 +1057,12 @@
10571057
10581058
 # Uncomment to enable Tcl support
10591059
 # FOSSIL_ENABLE_TCL = 1
10601060
10611061
 !ifdef FOSSIL_ENABLE_SSL
1062
-SSLINCDIR = $(B)\compat\openssl-1.0.1h\include
1063
-SSLLIBDIR = $(B)\compat\openssl-1.0.1h\out32
1062
+SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1063
+SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
10641064
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10651065
 !endif
10661066
10671067
 !ifdef FOSSIL_ENABLE_TCL
10681068
 TCLDIR = $(B)\compat\tcl-8.6
10691069
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -456,12 +456,12 @@
456 #### The directories where the OpenSSL include and library files are located.
457 # The recommended usage here is to use the Sysinternals junction tool
458 # to create a hard link between an "openssl-1.x" sub-directory of the
459 # Fossil source code directory and the target OpenSSL source directory.
460 #
461 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
462 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
463
464 #### Either the directory where the Tcl library is installed or the Tcl
465 # source code directory resides (depending on the value of the macro
466 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
467 # this directory must have "include" and "lib" sub-directories. If
@@ -1057,12 +1057,12 @@
1057
1058 # Uncomment to enable Tcl support
1059 # FOSSIL_ENABLE_TCL = 1
1060
1061 !ifdef FOSSIL_ENABLE_SSL
1062 SSLINCDIR = $(B)\compat\openssl-1.0.1h\include
1063 SSLLIBDIR = $(B)\compat\openssl-1.0.1h\out32
1064 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1065 !endif
1066
1067 !ifdef FOSSIL_ENABLE_TCL
1068 TCLDIR = $(B)\compat\tcl-8.6
1069
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -456,12 +456,12 @@
456 #### The directories where the OpenSSL include and library files are located.
457 # The recommended usage here is to use the Sysinternals junction tool
458 # to create a hard link between an "openssl-1.x" sub-directory of the
459 # Fossil source code directory and the target OpenSSL source directory.
460 #
461 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include
462 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i
463
464 #### Either the directory where the Tcl library is installed or the Tcl
465 # source code directory resides (depending on the value of the macro
466 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
467 # this directory must have "include" and "lib" sub-directories. If
@@ -1057,12 +1057,12 @@
1057
1058 # Uncomment to enable Tcl support
1059 # FOSSIL_ENABLE_TCL = 1
1060
1061 !ifdef FOSSIL_ENABLE_SSL
1062 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
1063 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
1064 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1065 !endif
1066
1067 !ifdef FOSSIL_ENABLE_TCL
1068 TCLDIR = $(B)\compat\tcl-8.6
1069
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -92,12 +92,12 @@
9292
 #### The directories where the OpenSSL include and library files are located.
9393
 # The recommended usage here is to use the Sysinternals junction tool
9494
 # to create a hard link between an "openssl-1.x" sub-directory of the
9595
 # Fossil source code directory and the target OpenSSL source directory.
9696
 #
97
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
98
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
97
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include
98
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i
9999
100100
 #### Either the directory where the Tcl library is installed or the Tcl
101101
 # source code directory resides (depending on the value of the macro
102102
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
103103
 # this directory must have "include" and "lib" sub-directories. If
104104
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -92,12 +92,12 @@
92 #### The directories where the OpenSSL include and library files are located.
93 # The recommended usage here is to use the Sysinternals junction tool
94 # to create a hard link between an "openssl-1.x" sub-directory of the
95 # Fossil source code directory and the target OpenSSL source directory.
96 #
97 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
98 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
99
100 #### Either the directory where the Tcl library is installed or the Tcl
101 # source code directory resides (depending on the value of the macro
102 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
103 # this directory must have "include" and "lib" sub-directories. If
104
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -92,12 +92,12 @@
92 #### The directories where the OpenSSL include and library files are located.
93 # The recommended usage here is to use the Sysinternals junction tool
94 # to create a hard link between an "openssl-1.x" sub-directory of the
95 # Fossil source code directory and the target OpenSSL source directory.
96 #
97 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include
98 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i
99
100 #### Either the directory where the Tcl library is installed or the Tcl
101 # source code directory resides (depending on the value of the macro
102 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
103 # this directory must have "include" and "lib" sub-directories. If
104
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -92,12 +92,12 @@
9292
 #### The directories where the OpenSSL include and library files are located.
9393
 # The recommended usage here is to use the Sysinternals junction tool
9494
 # to create a hard link between an "openssl-1.x" sub-directory of the
9595
 # Fossil source code directory and the target OpenSSL source directory.
9696
 #
97
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
98
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
97
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include
98
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i
9999
100100
 #### Either the directory where the Tcl library is installed or the Tcl
101101
 # source code directory resides (depending on the value of the macro
102102
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
103103
 # this directory must have "include" and "lib" sub-directories. If
104104
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -92,12 +92,12 @@
92 #### The directories where the OpenSSL include and library files are located.
93 # The recommended usage here is to use the Sysinternals junction tool
94 # to create a hard link between an "openssl-1.x" sub-directory of the
95 # Fossil source code directory and the target OpenSSL source directory.
96 #
97 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
98 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
99
100 #### Either the directory where the Tcl library is installed or the Tcl
101 # source code directory resides (depending on the value of the macro
102 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
103 # this directory must have "include" and "lib" sub-directories. If
104
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -92,12 +92,12 @@
92 #### The directories where the OpenSSL include and library files are located.
93 # The recommended usage here is to use the Sysinternals junction tool
94 # to create a hard link between an "openssl-1.x" sub-directory of the
95 # Fossil source code directory and the target OpenSSL source directory.
96 #
97 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include
98 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i
99
100 #### Either the directory where the Tcl library is installed or the Tcl
101 # source code directory resides (depending on the value of the macro
102 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
103 # this directory must have "include" and "lib" sub-directories. If
104
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -29,12 +29,12 @@
2929
3030
 # Uncomment to enable Tcl support
3131
 # FOSSIL_ENABLE_TCL = 1
3232
3333
 !ifdef FOSSIL_ENABLE_SSL
34
-SSLINCDIR = $(B)\compat\openssl-1.0.1h\include
35
-SSLLIBDIR = $(B)\compat\openssl-1.0.1h\out32
34
+SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
35
+SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
3636
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3737
 !endif
3838
3939
 !ifdef FOSSIL_ENABLE_TCL
4040
 TCLDIR = $(B)\compat\tcl-8.6
4141
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -29,12 +29,12 @@
29
30 # Uncomment to enable Tcl support
31 # FOSSIL_ENABLE_TCL = 1
32
33 !ifdef FOSSIL_ENABLE_SSL
34 SSLINCDIR = $(B)\compat\openssl-1.0.1h\include
35 SSLLIBDIR = $(B)\compat\openssl-1.0.1h\out32
36 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
37 !endif
38
39 !ifdef FOSSIL_ENABLE_TCL
40 TCLDIR = $(B)\compat\tcl-8.6
41
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -29,12 +29,12 @@
29
30 # Uncomment to enable Tcl support
31 # FOSSIL_ENABLE_TCL = 1
32
33 !ifdef FOSSIL_ENABLE_SSL
34 SSLINCDIR = $(B)\compat\openssl-1.0.1i\include
35 SSLLIBDIR = $(B)\compat\openssl-1.0.1i\out32
36 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
37 !endif
38
39 !ifdef FOSSIL_ENABLE_TCL
40 TCLDIR = $(B)\compat\tcl-8.6
41

Keyboard Shortcuts

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