anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply a patch (obtained by "cvs diff -u -D 2005/05/04 -D 2005/05/05" in the

Browse Source 
gettext repository) that streamlines OS X configuration. In particular, this
allows on OS X 10.5 to build against the 10/4 SDK.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@26168 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2008-08-14 20:42:58 +00:00
parent 89523861a7
commit ed48c4e8a8
4 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intl/langprefs.c
View File

@ -26,10 +26,10 @@
#if HAVE_CFPREFERENCESCOPYAPPVALUE #if HAVE_CFPREFERENCESCOPYAPPVALUE
# include <string.h> # include <string.h>
# include <CFPreferences.h> # include <CoreFoundation/CFPreferences.h>
# include <CFPropertyList.h> # include <CoreFoundation/CFPropertyList.h>
# include <CFArray.h> # include <CoreFoundation/CFArray.h>
# include <CFString.h> # include <CoreFoundation/CFString.h>
extern void _nl_locale_name_canonicalize (char *name); extern void _nl_locale_name_canonicalize (char *name);
#endif #endif

6
intl/localename.c
View File

@ -29,11 +29,11 @@
#if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE
# include <string.h> # include <string.h>
# include <CFString.h> # include <CoreFoundation/CFString.h>
# if HAVE_CFLOCALECOPYCURRENT # if HAVE_CFLOCALECOPYCURRENT
# include <CFLocale.h> # include <CoreFoundation/CFLocale.h>
# elif HAVE_CFPREFERENCESCOPYAPPVALUE # elif HAVE_CFPREFERENCESCOPYAPPVALUE
# include <CFPreferences.h> # include <CoreFoundation/CFPreferences.h>
# endif # endif
#endif #endif

23
m4/gettext.m4
View File

@ -1,4 +1,3 @@
# gettext.m4 serial 37 (gettext-0.14.4)
dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@ -444,10 +443,6 @@ __fsetlocking])
gt_LC_MESSAGES gt_LC_MESSAGES
fi fi
if test -n "$INTL_MACOSX_LIBS"; then
CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
fi
dnl intl/plural.c is generated from intl/plural.y. It requires bison, dnl intl/plural.c is generated from intl/plural.y. It requires bison,
dnl because plural.y uses bison specific features. It requires at least dnl because plural.y uses bison specific features. It requires at least
dnl bison-1.26 because earlier versions generate a plural.c that doesn't dnl bison-1.26 because earlier versions generate a plural.c that doesn't
@ -488,15 +483,12 @@ AC_DEFUN([gt_INTL_MACOSX],
dnl Check for API introduced in MacOS X 10.2. dnl Check for API introduced in MacOS X 10.2.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue], AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
gt_cv_func_CFPreferencesCopyAppValue, gt_cv_func_CFPreferencesCopyAppValue,
[gt_save_CPPFLAGS="$CPPFLAGS" [gt_save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
gt_save_LIBS="$LIBS" AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
LIBS="$LIBS -framework CoreFoundation"
AC_TRY_LINK([#include <CFPreferences.h>],
[CFPreferencesCopyAppValue(NULL, NULL)], [CFPreferencesCopyAppValue(NULL, NULL)],
[gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=yes],
[gt_cv_func_CFPreferencesCopyAppValue=no]) [gt_cv_func_CFPreferencesCopyAppValue=no])
CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"]) LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
@ -504,14 +496,11 @@ AC_DEFUN([gt_INTL_MACOSX],
fi fi
dnl Check for API introduced in MacOS X 10.3. dnl Check for API introduced in MacOS X 10.3.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
[gt_save_CPPFLAGS="$CPPFLAGS" [gt_save_LIBS="$LIBS"
CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
gt_save_LIBS="$LIBS" AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
LIBS="$LIBS -framework CoreFoundation"
AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
[gt_cv_func_CFLocaleCopyCurrent=yes], [gt_cv_func_CFLocaleCopyCurrent=yes],
[gt_cv_func_CFLocaleCopyCurrent=no]) [gt_cv_func_CFLocaleCopyCurrent=no])
CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"]) LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,

2
status.15x
View File

@ -68,3 +68,5 @@ What's new
* BUILD/INSTALLATION * BUILD/INSTALLATION
- Very light Makefile cleanup. - Very light Makefile cleanup.
- Fix the building on Mac OS X 10.5 of a binary compatible with OS X 10.4.