diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-15 03:42:15 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-15 03:42:15 -0400 |
| commit | 64d0bdba1149a78a1fab7efaac26a45ea719230e (patch) | |
| tree | 7b53eedb80604ec461b7d7f35cee7bf964c9183d /configure.ac | |
| parent | d90df04ae2c5283649101cb08e041e277a335274 (diff) | |
| download | xine-lib-64d0bdba1149a78a1fab7efaac26a45ea719230e.tar.gz xine-lib-64d0bdba1149a78a1fab7efaac26a45ea719230e.tar.bz2 | |
Mac OS X universal build fixes
-- Set -isysroot in CFLAGS and -syslibroot in LDFLAGS early
-- Patch libtool's sys_lib_search_path_spec to not search /usr/lib, et al.,
and instead search /Developer/SDKs/MacOSX10.4u.sdk/usr/lib so that it'll
find universal versions of stuff, libiconv.dylib in particular. There's
a libiconv.la file hanging around in /usr/lib that breaks everything
otherwise.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2511e5dda..24dbaf2e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1202,7 +1202,11 @@ dnl there have no trailing slash. dnl --------------------------------------------- dnl Note: Brackets [] must be doubled as they are treated as m4 macro quotes. -cat libtool | sed -e '/sys_lib_search_path_spec=/s/\/\([[ "]]\)/\1/g' > libtool.tmp +if test x"$enable_macosx_universal" = x"no"; then + cat libtool | sed -e '/sys_lib_search_path_spec=/s/\/\([[ "]]\)/\1/g' > libtool.tmp +else + cat libtool | sed -e 's,sys_lib_search_path_spec=.*$,sys_lib_search_path_spec=\"/Developer/SDKs/MacOSX10.4u.sdk/usr/lib\",' > libtool.tmp +fi mv -f libtool.tmp libtool chmod +x libtool |