| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108 |
- --- glib-2.48.0.orig/configure.ac 2016-03-22 16:16:50.000000000 +0100
- +++ glib-2.48.0/configure.ac 2016-04-07 21:29:21.000000000 +0200
- @@ -172,32 +172,10 @@ AC_MSG_RESULT([$glib_native_android])
-
- AC_SUBST(LIB_EXE_MACHINE_FLAG)
-
- -glib_have_carbon=no
- -AC_MSG_CHECKING([for Mac OS X Carbon support])
- -AC_TRY_CPP([
- -#include <Carbon/Carbon.h>
- -#include <CoreServices/CoreServices.h>
- -], glib_have_carbon=yes)
- -
- -AC_MSG_RESULT([$glib_have_carbon])
- -
- -glib_have_cocoa=no
- -AC_MSG_CHECKING([for Mac OS X Cocoa support])
- -AC_TRY_CPP([
- -#include <Cocoa/Cocoa.h>
- -#ifdef GNUSTEP_BASE_VERSION
- -#error "Detected GNUstep, not Cocoa"
- -#endif
- -], glib_have_cocoa=yes)
- -
- -AC_MSG_RESULT([$glib_have_cocoa])
- -
- AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"])
- AM_CONDITIONAL(OS_WIN32_X64, [test "$LIB_EXE_MACHINE_FLAG" = "X64"])
- AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"])
- AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"])
- -AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
- -AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
-
- AS_IF([test "$glib_native_win32" = "yes"], [
- AC_CHECK_TOOL(WINDRES, windres, no)
- @@ -214,19 +192,58 @@ AS_IF([test "$glib_native_win32" = "yes"
- ])
- AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes])
-
- -AS_IF([test "x$glib_have_carbon" = "xyes"], [
- +AC_ARG_ENABLE(carbon,
- + [AC_HELP_STRING([--disable-carbon],
- + [disable Max OS X Carbon support])],,
- + [enable_carbon=yes])
- +
- +glib_have_carbon=no
- +if test "x${enable_carbon}" = "xyes"; then
- + AC_MSG_RESULT([yes])
- + AC_MSG_CHECKING([for Mac OS X Carbon support])
- + AC_TRY_CPP([
- +#include <Carbon/Carbon.h>
- +#include <CoreServices/CoreServices.h>
- + ], glib_have_carbon=yes)
- + AC_MSG_RESULT([$glib_have_carbon])
- +else
- + AC_MSG_RESULT([no])
- +fi
- +AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"])
- +
- +if test "x$glib_have_carbon" = "xyes"; then
- AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available])
- CARBON_LIBS="-Wl,-framework,Carbon"
- LDFLAGS="$LDFLAGS $CARBON_LIBS"
- -], [CARBON_LIBS=""])
- -
- +fi
- AC_SUBST([CARBON_LIBS])
-
- -AS_IF([test "x$glib_have_cocoa" = "xyes"], [
- +dnl Check cocoa
- +AC_ARG_ENABLE(cocoa,
- + [AC_HELP_STRING([--disable-cocoa],
- + [disable Max OS X Cocoa support])],,
- + [enable_cocoa=yes])
- +
- +glib_have_cocoa=no
- +if test "x${enable_cocoa}" = "xyes"; then
- + AC_MSG_RESULT([yes])
- + AC_MSG_CHECKING([for Mac OS X Carbon support])
- + AC_TRY_CPP([
- +#include <Cocoa/Cocoa.h>
- +#ifdef GNUSTEP_BASE_VERSION
- +#error "Detected GNUstep, not Cocoa"
- +#endif
- + ], glib_have_cocoa=yes)
- + AC_MSG_RESULT([$glib_have_cocoa])
- +else
- + AC_MSG_RESULT([no])
- +fi
- +AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"])
- +
- +if test "x$glib_have_cocoa" = "xyes"; then
- AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
- COCOA_LIBS="-Wl,-framework,Foundation"
- LDFLAGS="$LDFLAGS $COCOA_LIBS"
- -
- osx_version=`sw_vers -productVersion`
- osx_min_version="10.9.0"
- AC_MSG_CHECKING([OSX version >= $osx_min_version])
- @@ -235,7 +252,7 @@ AS_IF([test "x$glib_have_cocoa" = "xyes"
- AC_MSG_ERROR([OSX version is too old!])
- ])
- AC_MSG_RESULT([yes])
- -], [COCOA_LIBS=""])
- +fi
-
- AC_SUBST([COCOA_LIBS])
-
|
