Fossil

Check-in [73443aa7]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Uncomment contents of Makefile.in. Silence OpenSSL deprecation warnings on Mac OS X 10.7.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | symlinks
Files: files | file ages | folders
SHA1: 73443aa7f8665b015feaa86be86e855a6cc59550
User & Date: dmitry 2011-09-02 10:19:08
Context
2011-09-02
10:34
Print description of conflict when 'stash apply' cannot merge a symlink and a regular file. check-in: bca6924e user: dmitry tags: symlinks
10:19
Uncomment contents of Makefile.in. Silence OpenSSL deprecation warnings on Mac OS X 10.7. check-in: 73443aa7 user: dmitry tags: symlinks
09:34
Bring Makefile.in back. check-in: 67295626 user: dmitry tags: symlinks
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in.

1
2
3
4
5
6

7
8
9
10

11
12
13
14
15


16
17
18
19
20
21
22

23
24
25
26
27

28
29
30
31
32
33
34

35
36
37
38
39
40
41
42
43
44
45
46
47
#!/usr/bin/make
#
## This is the top-level makefile for Fossil when the build is occurring
# on a unix platform.  This works out-of-the-box on most unix platforms.
# # But you are free to vary some of the definitions if desired.
# #

# #### The toplevel directory of the source tree.  Fossil can be built
# #    in a directory that is separate from the source tree.  Just change
# #    the following to point from the build directory to the src/ folder.
# #

# SRCDIR = @srcdir@/src
#
# #### The directory into which object code files should be written.
# #
# #


# OBJDIR = ./bld
#
# #### C Compiler and options for use in building executables that
# #    will run on the platform that is doing the build.  This is used
# #    to compile code-generator programs as part of the build process.
# #    See TCC below for the C compiler for building the finished binary.
# #

# BCC = @CC_FOR_BUILD@
#
# #### The suffix to add to final executable file.  When cross-compiling
# #    to windows, make this ".exe".  Otherwise leave it blank.
# #

# E = @EXEEXT@
#
# TCC = @CC@
#
# #### Tcl shell for use in running the fossil testsuite.  If you do not
# #    care about testing the end result, this can be blank.
# #

# TCLSH = tclsh
#
# LIB =LIB@LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
# TCC +=TCC@EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
# INSTALLDIR = $(DESTDIR)@prefix@/bin
# USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
#
# include $(SRCDIR)/main.mk
#
# distclean: clean
# 	rm -f autoconfig.h config.log Makefile
#
#


|

|
<
>
|
|
|
<
>
|
|
|
<
<
>
>
|
|
|
|
|
|
<
>
|
|
|
|
<
>
|
|
|
|
|
|
<
>
|
|
|
|
|
|
|
|
|
|
|
<
<
1
2
3
4
5

6
7
8
9

10
11
12
13


14
15
16
17
18
19
20
21

22
23
24
25
26

27
28
29
30
31
32
33

34
35
36
37
38
39
40
41
42
43
44
45


#!/usr/bin/make
#
# This is the top-level makefile for Fossil when the build is occurring
# on a unix platform.  This works out-of-the-box on most unix platforms.
# But you are free to vary some of the definitions if desired.

#
#### The toplevel directory of the source tree.  Fossil can be built
#    in a directory that is separate from the source tree.  Just change
#    the following to point from the build directory to the src/ folder.

#
SRCDIR = @srcdir@/src

#### The directory into which object code files should be written.


#
#
OBJDIR = ./bld

#### C Compiler and options for use in building executables that
#    will run on the platform that is doing the build.  This is used
#    to compile code-generator programs as part of the build process.
#    See TCC below for the C compiler for building the finished binary.

#
BCC = @CC_FOR_BUILD@

#### The suffix to add to final executable file.  When cross-compiling
#    to windows, make this ".exe".  Otherwise leave it blank.

#
E = @EXEEXT@

TCC = @CC@

#### Tcl shell for use in running the fossil testsuite.  If you do not
#    care about testing the end result, this can be blank.

#
TCLSH = tclsh

LIB =	@LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
TCC +=	@EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
INSTALLDIR = $(DESTDIR)@prefix@/bin
USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@

include $(SRCDIR)/main.mk

distclean: clean
	rm -f autoconfig.h config.log Makefile


Changes to auto.def.

132
133
134
135
136
137
138







139
140
141
142
143
144
145
    }
    if {$found} {
        define FOSSIL_ENABLE_SSL
        define-append EXTRA_CFLAGS $cflags
        define-append EXTRA_LDFLAGS $ldflags
        define-append LIBS -lssl -lcrypto
        msg-result "HTTP support enabled"







    } else {
        user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
    }
}

if {[opt-bool lineedit]} {
    # Need readline-compatible line editing







>
>
>
>
>
>
>







132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
    }
    if {$found} {
        define FOSSIL_ENABLE_SSL
        define-append EXTRA_CFLAGS $cflags
        define-append EXTRA_LDFLAGS $ldflags
        define-append LIBS -lssl -lcrypto
        msg-result "HTTP support enabled"

        # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
        if {[string match *-darwin* [get-define host]]} {
            if {[cctest -cflags {-Wdeprecated-declarations}]} {
                define-append EXTRA_CFLAGS -Wdeprecated-declarations
            }
        }
    } else {
        user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
    }
}

if {[opt-bool lineedit]} {
    # Need readline-compatible line editing