Fossil SCM

Update version of OpenSSL that is referred to in the makefiles.

mistachkin 2014-04-07 21:07 trunk
Commit c5b86115def7cb124972426a0429620598100197
Parent b153caf67ee006b…
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
@@ -444,12 +444,12 @@
444444
 #### The directories where the OpenSSL include and library files are located.
445445
 # The recommended usage here is to use the Sysinternals junction tool
446446
 # to create a hard link between an "openssl-1.x" sub-directory of the
447447
 # Fossil source code directory and the target OpenSSL source directory.
448448
 #
449
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
450
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
449
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
450
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
451451
452452
 #### Either the directory where the Tcl library is installed or the Tcl
453453
 # source code directory resides (depending on the value of the macro
454454
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
455455
 # this directory must have "include" and "lib" sub-directories. If
@@ -1012,12 +1012,12 @@
10121012
10131013
 # Uncomment to enable Tcl support
10141014
 # FOSSIL_ENABLE_TCL = 1
10151015
10161016
 !ifdef FOSSIL_ENABLE_SSL
1017
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1018
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1017
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1018
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
10191019
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10201020
 !endif
10211021
10221022
 !ifdef FOSSIL_ENABLE_TCL
10231023
 TCLDIR = $(B)\compat\tcl-8.6
10241024
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -444,12 +444,12 @@
444 #### The directories where the OpenSSL include and library files are located.
445 # The recommended usage here is to use the Sysinternals junction tool
446 # to create a hard link between an "openssl-1.x" sub-directory of the
447 # Fossil source code directory and the target OpenSSL source directory.
448 #
449 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
450 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
451
452 #### Either the directory where the Tcl library is installed or the Tcl
453 # source code directory resides (depending on the value of the macro
454 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
455 # this directory must have "include" and "lib" sub-directories. If
@@ -1012,12 +1012,12 @@
1012
1013 # Uncomment to enable Tcl support
1014 # FOSSIL_ENABLE_TCL = 1
1015
1016 !ifdef FOSSIL_ENABLE_SSL
1017 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
1018 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
1019 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1020 !endif
1021
1022 !ifdef FOSSIL_ENABLE_TCL
1023 TCLDIR = $(B)\compat\tcl-8.6
1024
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -444,12 +444,12 @@
444 #### The directories where the OpenSSL include and library files are located.
445 # The recommended usage here is to use the Sysinternals junction tool
446 # to create a hard link between an "openssl-1.x" sub-directory of the
447 # Fossil source code directory and the target OpenSSL source directory.
448 #
449 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
450 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
451
452 #### Either the directory where the Tcl library is installed or the Tcl
453 # source code directory resides (depending on the value of the macro
454 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
455 # this directory must have "include" and "lib" sub-directories. If
@@ -1012,12 +1012,12 @@
1012
1013 # Uncomment to enable Tcl support
1014 # FOSSIL_ENABLE_TCL = 1
1015
1016 !ifdef FOSSIL_ENABLE_SSL
1017 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1018 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
1019 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1020 !endif
1021
1022 !ifdef FOSSIL_ENABLE_TCL
1023 TCLDIR = $(B)\compat\tcl-8.6
1024
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
8484
 #### The directories where the OpenSSL include and library files are located.
8585
 # The recommended usage here is to use the Sysinternals junction tool
8686
 # to create a hard link between an "openssl-1.x" sub-directory of the
8787
 # Fossil source code directory and the target OpenSSL source directory.
8888
 #
89
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
89
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
9191
9292
 #### Either the directory where the Tcl library is installed or the Tcl
9393
 # source code directory resides (depending on the value of the macro
9494
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9595
 # this directory must have "include" and "lib" sub-directories. If
9696
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1f/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1f
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -84,12 +84,12 @@
84 #### The directories where the OpenSSL include and library files are located.
85 # The recommended usage here is to use the Sysinternals junction tool
86 # to create a hard link between an "openssl-1.x" sub-directory of the
87 # Fossil source code directory and the target OpenSSL source directory.
88 #
89 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
90 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
91
92 #### Either the directory where the Tcl library is installed or the Tcl
93 # source code directory resides (depending on the value of the macro
94 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
95 # this directory must have "include" and "lib" sub-directories. If
96
M win/Makefile.msc
+2 -2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -26,12 +26,12 @@
2626
2727
 # Uncomment to enable Tcl support
2828
 # FOSSIL_ENABLE_TCL = 1
2929
3030
 !ifdef FOSSIL_ENABLE_SSL
31
-SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
32
-SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
31
+SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
32
+SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
3333
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
3434
 !endif
3535
3636
 !ifdef FOSSIL_ENABLE_TCL
3737
 TCLDIR = $(B)\compat\tcl-8.6
3838
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -26,12 +26,12 @@
26
27 # Uncomment to enable Tcl support
28 # FOSSIL_ENABLE_TCL = 1
29
30 !ifdef FOSSIL_ENABLE_SSL
31 SSLINCDIR = $(B)\compat\openssl-1.0.1f\include
32 SSLLIBDIR = $(B)\compat\openssl-1.0.1f\out32
33 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
34 !endif
35
36 !ifdef FOSSIL_ENABLE_TCL
37 TCLDIR = $(B)\compat\tcl-8.6
38
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -26,12 +26,12 @@
26
27 # Uncomment to enable Tcl support
28 # FOSSIL_ENABLE_TCL = 1
29
30 !ifdef FOSSIL_ENABLE_SSL
31 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
32 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
33 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
34 !endif
35
36 !ifdef FOSSIL_ENABLE_TCL
37 TCLDIR = $(B)\compat\tcl-8.6
38

Keyboard Shortcuts

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