Fossil SCM

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

mistachkin 2014-06-05 18:39 trunk
Commit 94c0eb9724fbbcb117edd73408d1721f630a046d
Parent 5610dc4edfcacf0…
4 files changed +4 -4 +2 -2 +3 -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
@@ -449,12 +449,12 @@
449449
 #### The directories where the OpenSSL include and library files are located.
450450
 # The recommended usage here is to use the Sysinternals junction tool
451451
 # to create a hard link between an "openssl-1.x" sub-directory of the
452452
 # Fossil source code directory and the target OpenSSL source directory.
453453
 #
454
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
455
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
454
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
455
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
456456
457457
 #### Either the directory where the Tcl library is installed or the Tcl
458458
 # source code directory resides (depending on the value of the macro
459459
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
460460
 # this directory must have "include" and "lib" sub-directories. If
@@ -1029,12 +1029,12 @@
10291029
10301030
 # Uncomment to enable Tcl support
10311031
 # FOSSIL_ENABLE_TCL = 1
10321032
10331033
 !ifdef FOSSIL_ENABLE_SSL
1034
-SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1035
-SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
1034
+SSLINCDIR = $(B)\compat\openssl-1.0.1h\include
1035
+SSLLIBDIR = $(B)\compat\openssl-1.0.1h\out32
10361036
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
10371037
 !endif
10381038
10391039
 !ifdef FOSSIL_ENABLE_TCL
10401040
 TCLDIR = $(B)\compat\tcl-8.6
10411041
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -449,12 +449,12 @@
449 #### The directories where the OpenSSL include and library files are located.
450 # The recommended usage here is to use the Sysinternals junction tool
451 # to create a hard link between an "openssl-1.x" sub-directory of the
452 # Fossil source code directory and the target OpenSSL source directory.
453 #
454 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
455 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
456
457 #### Either the directory where the Tcl library is installed or the Tcl
458 # source code directory resides (depending on the value of the macro
459 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
460 # this directory must have "include" and "lib" sub-directories. If
@@ -1029,12 +1029,12 @@
1029
1030 # Uncomment to enable Tcl support
1031 # FOSSIL_ENABLE_TCL = 1
1032
1033 !ifdef FOSSIL_ENABLE_SSL
1034 SSLINCDIR = $(B)\compat\openssl-1.0.1g\include
1035 SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
1036 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1037 !endif
1038
1039 !ifdef FOSSIL_ENABLE_TCL
1040 TCLDIR = $(B)\compat\tcl-8.6
1041
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -449,12 +449,12 @@
449 #### The directories where the OpenSSL include and library files are located.
450 # The recommended usage here is to use the Sysinternals junction tool
451 # to create a hard link between an "openssl-1.x" sub-directory of the
452 # Fossil source code directory and the target OpenSSL source directory.
453 #
454 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
455 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
456
457 #### Either the directory where the Tcl library is installed or the Tcl
458 # source code directory resides (depending on the value of the macro
459 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
460 # this directory must have "include" and "lib" sub-directories. If
@@ -1029,12 +1029,12 @@
1029
1030 # Uncomment to enable Tcl support
1031 # FOSSIL_ENABLE_TCL = 1
1032
1033 !ifdef FOSSIL_ENABLE_SSL
1034 SSLINCDIR = $(B)\compat\openssl-1.0.1h\include
1035 SSLLIBDIR = $(B)\compat\openssl-1.0.1h\out32
1036 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1037 !endif
1038
1039 !ifdef FOSSIL_ENABLE_TCL
1040 TCLDIR = $(B)\compat\tcl-8.6
1041
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -88,12 +88,12 @@
8888
 #### The directories where the OpenSSL include and library files are located.
8989
 # The recommended usage here is to use the Sysinternals junction tool
9090
 # to create a hard link between an "openssl-1.x" sub-directory of the
9191
 # Fossil source code directory and the target OpenSSL source directory.
9292
 #
93
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
94
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
93
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
94
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
9595
9696
 #### Either the directory where the Tcl library is installed or the Tcl
9797
 # source code directory resides (depending on the value of the macro
9898
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9999
 # this directory must have "include" and "lib" sub-directories. If
100100
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -88,12 +88,12 @@
88 #### The directories where the OpenSSL include and library files are located.
89 # The recommended usage here is to use the Sysinternals junction tool
90 # to create a hard link between an "openssl-1.x" sub-directory of the
91 # Fossil source code directory and the target OpenSSL source directory.
92 #
93 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
94 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
95
96 #### Either the directory where the Tcl library is installed or the Tcl
97 # source code directory resides (depending on the value of the macro
98 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
99 # this directory must have "include" and "lib" sub-directories. If
100
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -88,12 +88,12 @@
88 #### The directories where the OpenSSL include and library files are located.
89 # The recommended usage here is to use the Sysinternals junction tool
90 # to create a hard link between an "openssl-1.x" sub-directory of the
91 # Fossil source code directory and the target OpenSSL source directory.
92 #
93 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
94 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
95
96 #### Either the directory where the Tcl library is installed or the Tcl
97 # source code directory resides (depending on the value of the macro
98 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
99 # this directory must have "include" and "lib" sub-directories. If
100
M win/Makefile.mingw.mistachkin
+3 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -88,12 +88,12 @@
8888
 #### The directories where the OpenSSL include and library files are located.
8989
 # The recommended usage here is to use the Sysinternals junction tool
9090
 # to create a hard link between an "openssl-1.x" sub-directory of the
9191
 # Fossil source code directory and the target OpenSSL source directory.
9292
 #
93
-OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
94
-OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
93
+OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
94
+OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
9595
9696
 #### Either the directory where the Tcl library is installed or the Tcl
9797
 # source code directory resides (depending on the value of the macro
9898
 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
9999
 # this directory must have "include" and "lib" sub-directories. If
@@ -1771,5 +1771,6 @@
17711771
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
17721772
 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
17731773
17741774
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
17751775
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1776
+
17761777
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -88,12 +88,12 @@
88 #### The directories where the OpenSSL include and library files are located.
89 # The recommended usage here is to use the Sysinternals junction tool
90 # to create a hard link between an "openssl-1.x" sub-directory of the
91 # Fossil source code directory and the target OpenSSL source directory.
92 #
93 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1g/include
94 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1g
95
96 #### Either the directory where the Tcl library is installed or the Tcl
97 # source code directory resides (depending on the value of the macro
98 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
99 # this directory must have "include" and "lib" sub-directories. If
@@ -1771,5 +1771,6 @@
1771 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1772 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1773
1774 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1775 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
 
1776
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -88,12 +88,12 @@
88 #### The directories where the OpenSSL include and library files are located.
89 # The recommended usage here is to use the Sysinternals junction tool
90 # to create a hard link between an "openssl-1.x" sub-directory of the
91 # Fossil source code directory and the target OpenSSL source directory.
92 #
93 OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1h/include
94 OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1h
95
96 #### Either the directory where the Tcl library is installed or the Tcl
97 # source code directory resides (depending on the value of the macro
98 # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory,
99 # this directory must have "include" and "lib" sub-directories. If
@@ -1771,5 +1771,6 @@
1771 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1772 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1773
1774 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
1775 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o
1776
1777
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.1g\include
32
-SSLLIBDIR = $(B)\compat\openssl-1.0.1g\out32
31
+SSLINCDIR = $(B)\compat\openssl-1.0.1h\include
32
+SSLLIBDIR = $(B)\compat\openssl-1.0.1h\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.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
--- 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.1h\include
32 SSLLIBDIR = $(B)\compat\openssl-1.0.1h\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