Fossil SCM
Uncomment contents of Makefile.in. Silence OpenSSL deprecation warnings on Mac OS X 10.7.
Commit
73443aa7f8665b015feaa86be86e855a6cc59550
Parent
67295626750b201…
2 files changed
+43
-45
+7
+43
-45
| --- Makefile.in | ||
| +++ Makefile.in | ||
| @@ -1,47 +1,45 @@ | ||
| 1 | 1 | #!/usr/bin/make |
| 2 | 2 | # |
| 3 | -## This is the top-level makefile for Fossil when the build is occurring | |
| 4 | -# on a unix platform. This works out-of-the-box on most unix platforms. | |
| 5 | -# # But you are free to vary some of the definitions if desired. | |
| 6 | -# # | |
| 7 | -# #### The toplevel directory of the source tree. Fossil can be built | |
| 8 | -# # in a directory that is separate from the source tree. Just change | |
| 9 | -# # the following to point from the build directory to the src/ folder. | |
| 10 | -# # | |
| 11 | -# SRCDIR = @srcdir@/src | |
| 12 | -# | |
| 13 | -# #### The directory into which object code files should be written. | |
| 14 | -# # | |
| 15 | -# # | |
| 16 | -# OBJDIR = ./bld | |
| 17 | -# | |
| 18 | -# #### C Compiler and options for use in building executables that | |
| 19 | -# # will run on the platform that is doing the build. This is used | |
| 20 | -# # to compile code-generator programs as part of the build process. | |
| 21 | -# # See TCC below for the C compiler for building the finished binary. | |
| 22 | -# # | |
| 23 | -# BCC = @CC_FOR_BUILD@ | |
| 24 | -# | |
| 25 | -# #### The suffix to add to final executable file. When cross-compiling | |
| 26 | -# # to windows, make this ".exe". Otherwise leave it blank. | |
| 27 | -# # | |
| 28 | -# E = @EXEEXT@ | |
| 29 | -# | |
| 30 | -# TCC = @CC@ | |
| 31 | -# | |
| 32 | -# #### Tcl shell for use in running the fossil testsuite. If you do not | |
| 33 | -# # care about testing the end result, this can be blank. | |
| 34 | -# # | |
| 35 | -# TCLSH = tclsh | |
| 36 | -# | |
| 37 | -# LIB =LIB@LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ | |
| 38 | -# TCC +=TCC@EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H | |
| 39 | -# INSTALLDIR = $(DESTDIR)@prefix@/bin | |
| 40 | -# USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ | |
| 41 | -# | |
| 42 | -# include $(SRCDIR)/main.mk | |
| 43 | -# | |
| 44 | -# distclean: clean | |
| 45 | -# rm -f autoconfig.h config.log Makefile | |
| 46 | -# | |
| 47 | -# | |
| 3 | +# This is the top-level makefile for Fossil when the build is occurring | |
| 4 | +# on a unix platform. This works out-of-the-box on most unix platforms. | |
| 5 | +# But you are free to vary some of the definitions if desired. | |
| 6 | +# | |
| 7 | +#### The toplevel directory of the source tree. Fossil can be built | |
| 8 | +# in a directory that is separate from the source tree. Just change | |
| 9 | +# the following to point from the build directory to the src/ folder. | |
| 10 | +# | |
| 11 | +SRCDIR = @srcdir@/src | |
| 12 | + | |
| 13 | +#### The directory into which object code files should be written. | |
| 14 | +# | |
| 15 | +# | |
| 16 | +OBJDIR = ./bld | |
| 17 | + | |
| 18 | +#### C Compiler and options for use in building executables that | |
| 19 | +# will run on the platform that is doing the build. This is used | |
| 20 | +# to compile code-generator programs as part of the build process. | |
| 21 | +# See TCC below for the C compiler for building the finished binary. | |
| 22 | +# | |
| 23 | +BCC = @CC_FOR_BUILD@ | |
| 24 | + | |
| 25 | +#### The suffix to add to final executable file. When cross-compiling | |
| 26 | +# to windows, make this ".exe". Otherwise leave it blank. | |
| 27 | +# | |
| 28 | +E = @EXEEXT@ | |
| 29 | + | |
| 30 | +TCC = @CC@ | |
| 31 | + | |
| 32 | +#### Tcl shell for use in running the fossil testsuite. If you do not | |
| 33 | +# care about testing the end result, this can be blank. | |
| 34 | +# | |
| 35 | +TCLSH = tclsh | |
| 36 | + | |
| 37 | +LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ | |
| 38 | +TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H | |
| 39 | +INSTALLDIR = $(DESTDIR)@prefix@/bin | |
| 40 | +USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ | |
| 41 | + | |
| 42 | +include $(SRCDIR)/main.mk | |
| 43 | + | |
| 44 | +distclean: clean | |
| 45 | + rm -f autoconfig.h config.log Makefile | |
| 48 | 46 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -1,47 +1,45 @@ | |
| 1 | #!/usr/bin/make |
| 2 | # |
| 3 | ## This is the top-level makefile for Fossil when the build is occurring |
| 4 | # on a unix platform. This works out-of-the-box on most unix platforms. |
| 5 | # # But you are free to vary some of the definitions if desired. |
| 6 | # # |
| 7 | # #### The toplevel directory of the source tree. Fossil can be built |
| 8 | # # in a directory that is separate from the source tree. Just change |
| 9 | # # the following to point from the build directory to the src/ folder. |
| 10 | # # |
| 11 | # SRCDIR = @srcdir@/src |
| 12 | # |
| 13 | # #### The directory into which object code files should be written. |
| 14 | # # |
| 15 | # # |
| 16 | # OBJDIR = ./bld |
| 17 | # |
| 18 | # #### C Compiler and options for use in building executables that |
| 19 | # # will run on the platform that is doing the build. This is used |
| 20 | # # to compile code-generator programs as part of the build process. |
| 21 | # # See TCC below for the C compiler for building the finished binary. |
| 22 | # # |
| 23 | # BCC = @CC_FOR_BUILD@ |
| 24 | # |
| 25 | # #### The suffix to add to final executable file. When cross-compiling |
| 26 | # # to windows, make this ".exe". Otherwise leave it blank. |
| 27 | # # |
| 28 | # E = @EXEEXT@ |
| 29 | # |
| 30 | # TCC = @CC@ |
| 31 | # |
| 32 | # #### Tcl shell for use in running the fossil testsuite. If you do not |
| 33 | # # care about testing the end result, this can be blank. |
| 34 | # # |
| 35 | # TCLSH = tclsh |
| 36 | # |
| 37 | # LIB =LIB@LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 38 | # TCC +=TCC@EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H |
| 39 | # INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 40 | # USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 41 | # |
| 42 | # include $(SRCDIR)/main.mk |
| 43 | # |
| 44 | # distclean: clean |
| 45 | # rm -f autoconfig.h config.log Makefile |
| 46 | # |
| 47 | # |
| 48 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -1,47 +1,45 @@ | |
| 1 | #!/usr/bin/make |
| 2 | # |
| 3 | # This is the top-level makefile for Fossil when the build is occurring |
| 4 | # on a unix platform. This works out-of-the-box on most unix platforms. |
| 5 | # But you are free to vary some of the definitions if desired. |
| 6 | # |
| 7 | #### The toplevel directory of the source tree. Fossil can be built |
| 8 | # in a directory that is separate from the source tree. Just change |
| 9 | # the following to point from the build directory to the src/ folder. |
| 10 | # |
| 11 | SRCDIR = @srcdir@/src |
| 12 | |
| 13 | #### The directory into which object code files should be written. |
| 14 | # |
| 15 | # |
| 16 | OBJDIR = ./bld |
| 17 | |
| 18 | #### C Compiler and options for use in building executables that |
| 19 | # will run on the platform that is doing the build. This is used |
| 20 | # to compile code-generator programs as part of the build process. |
| 21 | # See TCC below for the C compiler for building the finished binary. |
| 22 | # |
| 23 | BCC = @CC_FOR_BUILD@ |
| 24 | |
| 25 | #### The suffix to add to final executable file. When cross-compiling |
| 26 | # to windows, make this ".exe". Otherwise leave it blank. |
| 27 | # |
| 28 | E = @EXEEXT@ |
| 29 | |
| 30 | TCC = @CC@ |
| 31 | |
| 32 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 33 | # care about testing the end result, this can be blank. |
| 34 | # |
| 35 | TCLSH = tclsh |
| 36 | |
| 37 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 38 | TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H |
| 39 | INSTALLDIR = $(DESTDIR)@prefix@/bin |
| 40 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| 41 | |
| 42 | include $(SRCDIR)/main.mk |
| 43 | |
| 44 | distclean: clean |
| 45 | rm -f autoconfig.h config.log Makefile |
| 46 |
M
auto.def
+7
| --- auto.def | ||
| +++ auto.def | ||
| @@ -134,10 +134,17 @@ | ||
| 134 | 134 | define FOSSIL_ENABLE_SSL |
| 135 | 135 | define-append EXTRA_CFLAGS $cflags |
| 136 | 136 | define-append EXTRA_LDFLAGS $ldflags |
| 137 | 137 | define-append LIBS -lssl -lcrypto |
| 138 | 138 | msg-result "HTTP support enabled" |
| 139 | + | |
| 140 | + # Silence OpenSSL deprecation warnings on Mac OS X 10.7. | |
| 141 | + if {[string match *-darwin* [get-define host]]} { | |
| 142 | + if {[cctest -cflags {-Wdeprecated-declarations}]} { | |
| 143 | + define-append EXTRA_CFLAGS -Wdeprecated-declarations | |
| 144 | + } | |
| 145 | + } | |
| 139 | 146 | } else { |
| 140 | 147 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 141 | 148 | } |
| 142 | 149 | } |
| 143 | 150 | |
| 144 | 151 |
| --- auto.def | |
| +++ auto.def | |
| @@ -134,10 +134,17 @@ | |
| 134 | define FOSSIL_ENABLE_SSL |
| 135 | define-append EXTRA_CFLAGS $cflags |
| 136 | define-append EXTRA_LDFLAGS $ldflags |
| 137 | define-append LIBS -lssl -lcrypto |
| 138 | msg-result "HTTP support enabled" |
| 139 | } else { |
| 140 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 141 | } |
| 142 | } |
| 143 | |
| 144 |
| --- auto.def | |
| +++ auto.def | |
| @@ -134,10 +134,17 @@ | |
| 134 | define FOSSIL_ENABLE_SSL |
| 135 | define-append EXTRA_CFLAGS $cflags |
| 136 | define-append EXTRA_LDFLAGS $ldflags |
| 137 | define-append LIBS -lssl -lcrypto |
| 138 | msg-result "HTTP support enabled" |
| 139 | |
| 140 | # Silence OpenSSL deprecation warnings on Mac OS X 10.7. |
| 141 | if {[string match *-darwin* [get-define host]]} { |
| 142 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 143 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 144 | } |
| 145 | } |
| 146 | } else { |
| 147 | user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support" |
| 148 | } |
| 149 | } |
| 150 | |
| 151 |