Changeset 559cd60 in git for configure.ac


Ignore:
Timestamp:
04/09/19 03:25:57 (7 weeks ago)
Author:
Olly Betts <olly@…>
Branches:
master
Children:
b74755e
Parents:
7061908
Message:

Consistently refer to macOS not OS X, etc

Apple renamed it yet again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r7061908 r559cd60  
    8383
    8484mswindows=no
    85 macosx=no
     85macos=no
    8686case $host_os in
    87 darwin*) macosx=yes ;;
     87darwin*) macos=yes ;;
    8888*mingw*|*cygwin*|windows*) mswindows=yes ;;
    8989esac
     
    106106
    107107AM_CONDITIONAL(WIN32, [test yes = "$mswindows"])
    108 AM_CONDITIONAL(MACOSX, [test yes = "$macosx"])
     108AM_CONDITIONAL(MACOS, [test yes = "$macos"])
    109109
    110110if test -n "$WX_CONFIG" ; then
     
    117117  fi
    118118else
    119   if test yes = "$macosx" ; then
     119  if test yes = "$macos" ; then
    120120    wxdef=__WXMAC__
    121121  elif test yes = "$mswindows" ; then
     
    161161AC_CHECK_LIB([GL], [glPushMatrix], [WX_LIBS="$WX_LIBS -lGL"], [], [$WX_LIBS])
    162162AC_SUBST(WX_LIBS)
    163 dnl Mac OS X has OpenGL/gl.h.
     163dnl macOS has OpenGL/gl.h.
    164164AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], [], [], [ ])
    165 dnl The Debian mingw-w64 packages lack GL/glext.h; Mac OS X has OpenGL/glext.h.
     165dnl The Debian mingw-w64 packages lack GL/glext.h; macOS has OpenGL/glext.h.
    166166AC_CHECK_HEADERS([GL/glext.h OpenGL/glext.h], [], [], [#include <GL/gl.h>])
    167167
Note: See TracChangeset for help on using the changeset viewer.