Lines 169-200
Link Here
|
169 |
|
169 |
|
170 |
AC_SUBST(LIB_EXE_MACHINE_FLAG) |
170 |
AC_SUBST(LIB_EXE_MACHINE_FLAG) |
171 |
|
171 |
|
172 |
glib_have_carbon=no |
|
|
173 |
AC_MSG_CHECKING([for Mac OS X Carbon support]) |
174 |
AC_TRY_CPP([ |
175 |
#include <Carbon/Carbon.h> |
176 |
#include <CoreServices/CoreServices.h> |
177 |
], glib_have_carbon=yes) |
178 |
|
179 |
AC_MSG_RESULT([$glib_have_carbon]) |
180 |
|
181 |
glib_have_cocoa=no |
182 |
AC_MSG_CHECKING([for Mac OS X Cocoa support]) |
183 |
AC_TRY_CPP([ |
184 |
#include <Cocoa/Cocoa.h> |
185 |
#ifdef GNUSTEP_BASE_VERSION |
186 |
#error "Detected GNUstep, not Cocoa" |
187 |
#endif |
188 |
], glib_have_cocoa=yes) |
189 |
|
190 |
AC_MSG_RESULT([$glib_have_cocoa]) |
191 |
|
192 |
AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"]) |
172 |
AM_CONDITIONAL(OS_WIN32, [test "$glib_native_win32" = "yes"]) |
193 |
AM_CONDITIONAL(OS_WIN32_X64, [test "$LIB_EXE_MACHINE_FLAG" = "X64"]) |
173 |
AM_CONDITIONAL(OS_WIN32_X64, [test "$LIB_EXE_MACHINE_FLAG" = "X64"]) |
194 |
AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"]) |
174 |
AM_CONDITIONAL(OS_UNIX, [test "$glib_native_win32" != "yes"]) |
195 |
AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"]) |
175 |
AM_CONDITIONAL(OS_LINUX, [test "$glib_os_linux" = "yes"]) |
196 |
AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"]) |
|
|
197 |
AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"]) |
198 |
|
176 |
|
199 |
AS_IF([test "$glib_native_win32" = "yes"], [ |
177 |
AS_IF([test "$glib_native_win32" = "yes"], [ |
200 |
AC_CHECK_TOOL(WINDRES, windres, no) |
178 |
AC_CHECK_TOOL(WINDRES, windres, no) |
Lines 211-227
Link Here
|
211 |
]) |
189 |
]) |
212 |
AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes]) |
190 |
AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes]) |
213 |
|
191 |
|
214 |
AS_IF([test "x$glib_have_carbon" = "xyes"], [ |
192 |
dnl declare --enable-* args and collect ac_help strings |
215 |
AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) |
193 |
|
216 |
LDFLAGS="$LDFLAGS -Wl,-framework,Carbon" |
194 |
AC_ARG_ENABLE(framework, |
|
|
195 |
AS_HELP_STRING([--enable-framework=@<:@no/yes@:>@], |
196 |
[turn on carbon/cocoa support @<:@default=no@:>@]),, |
197 |
enable_framework=no) |
198 |
|
199 |
glib_have_carbon=no |
200 |
glib_have_cocoa=no |
201 |
AS_IF([test "x$enable_framework" = "xyes"], [ |
202 |
AC_MSG_CHECKING([for Mac OS X Carbon support]) |
203 |
AC_TRY_CPP([ |
204 |
#include <Carbon/Carbon.h> |
205 |
#include <CoreServices/CoreServices.h> |
206 |
], glib_have_carbon=yes) |
207 |
|
208 |
AC_MSG_RESULT([$glib_have_carbon]) |
209 |
|
210 |
AS_IF([test "$glib_have_carbon" = "yes"], [ |
211 |
AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is enabled]) |
212 |
LDFLAGS="$LDFLAGS -Wl,-framework,Carbon" |
213 |
]) |
214 |
|
215 |
AC_MSG_CHECKING([for Mac OS X Cocoa support]) |
216 |
AC_TRY_CPP([ |
217 |
#include <Cocoa/Cocoa.h> |
218 |
#ifdef GNUSTEP_BASE_VERSION |
219 |
#error "Detected GNUstep, not Cocoa" |
220 |
#endif |
221 |
], glib_have_cocoa=yes) |
222 |
|
223 |
AC_MSG_RESULT([$glib_have_cocoa]) |
224 |
|
225 |
AS_IF([test "$glib_have_cocoa" = "yes"], [ |
226 |
AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is enabled]) |
227 |
LDFLAGS="$LDFLAGS -Wl,-framework,Foundation" |
228 |
]) |
217 |
]) |
229 |
]) |
218 |
|
230 |
|
219 |
if test "x$glib_have_cocoa" = "xyes"; then |
231 |
AM_CONDITIONAL(OS_CARBON, [test "$glib_have_carbon" = "yes"]) |
220 |
AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available]) |
232 |
AM_CONDITIONAL(OS_COCOA, [test "$glib_have_cocoa" = "yes"]) |
221 |
LDFLAGS="$LDFLAGS -Wl,-framework,Foundation" |
|
|
222 |
fi |
223 |
|
233 |
|
224 |
dnl declare --enable-* args and collect ac_help strings |
|
|
225 |
AC_ARG_ENABLE(debug, |
234 |
AC_ARG_ENABLE(debug, |
226 |
AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@], |
235 |
AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@], |
227 |
[turn on debugging @<:@default=glib_debug_default@:>@]),, |
236 |
[turn on debugging @<:@default=glib_debug_default@:>@]),, |