diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-11 22:23:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-11 22:23:31 -0500 |
| commit | cbdb3c92f58c4ab1f80542d8e2c1b54557db29dc (patch) | |
| tree | 5dc5b616d71f356365351a8cb0c18d80aca65028 | |
| parent | 14edb0bd0cc97a8cab84b9e28c7bfe97b3a0cbc0 (diff) | |
| parent | ef53526b104675cadb0e52dd3d9d407d1d027073 (diff) | |
| download | tor-cbdb3c92f58c4ab1f80542d8e2c1b54557db29dc.tar.gz tor-cbdb3c92f58c4ab1f80542d8e2c1b54557db29dc.zip | |
Merge branch 'maint-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 2f556271f9..bf721a9e64 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 |