diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-11 22:22:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-11 22:22:35 -0500 |
| commit | c80b7186bcd0b7759c8660c42b05556b45e67711 (patch) | |
| tree | 9f04b6a5dbef68054485250dc1c2cce380554ae4 | |
| parent | 863538ae4f751abfd64809806229353e546241de (diff) | |
| parent | ef53526b104675cadb0e52dd3d9d407d1d027073 (diff) | |
| download | tor-c80b7186bcd0b7759c8660c42b05556b45e67711.tar.gz tor-c80b7186bcd0b7759c8660c42b05556b45e67711.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/bug20935 | 3 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/changes/bug20935 b/changes/bug20935 new file mode 100644 index 0000000000..78068c7c06 --- /dev/null +++ b/changes/bug20935 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac + Fixes bug 20935; bugfix on 0.2.9.6-rc. diff --git a/configure.ac b/configure.ac index df68ffa8f7..699eafc51c 100644 --- a/configure.ac +++ b/configure.ac @@ -430,11 +430,11 @@ AC_MSG_CHECKING([for a pre-Sierra OSX build target]) AC_TRY_COMPILE([ #ifdef __APPLE__ # include <AvailabilityMacros.h> -# ifndef MAC_OS_VERSION_10_12 -# define MAC_OS_VERSION_10_12 101200 +# ifndef MAC_OS_X_VERSION_10_12 +# define MAC_OS_X_VERSION_10_12 101200 # endif # if defined(MAC_OS_X_VERSION_MIN_REQUIRED) -# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_10_12 +# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12 # error "Running on Mac OSX 10.11 or earlier" # endif # endif |