From 807d1f979a8963e05b7403f3529c99b35cbe347d Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Sat, 5 May 2007 21:49:50 -0400 Subject: More configure cleanups. -- Move Windows port checks to an earlier point, but after AC_PROG_CC and AC_PROG_EGREP are done, because it depends on both of them. Also rename SYS to WIN32_SYS, because the former is way too generic and prone to clashes from elsewhere. -- Removed some dead automake work-arounds that should no longer be necessary with the new automake 1.9 requirement -- For Mac OS X universal builds, don't set CFLAGS/OBJCFLAGS/LDFLAGS so early with multiple -arch flags. Set them at the end from UNIVERSAL_CFLAGS and UNIVERSAL_LDFLAGS. -- Move set of INCLUDES down to final set of CFLAGS/OBJCFLAGS/LDFLAGS. --- m4/macosx.m4 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'm4') diff --git a/m4/macosx.m4 b/m4/macosx.m4 index bcc40f0dc..1c1becd2e 100644 --- a/m4/macosx.m4 +++ b/m4/macosx.m4 @@ -30,16 +30,10 @@ AC_DEFUN([MACOSX_UNIVERSAL_BINARIES], [ host="`echo $host | sed -e s/$host_cpu/universal/g`" host_cpu=universal - CFLAGS="$CFLAGS $UNIVERSAL_CFLAGS" - OBJCFLAGS="$OBJCFLAGS $UNIVERSAL_CFLAGS" - LDFLAGS="$LDFLAGS $UNIVERSAL_LDFLAGS" AC_DEFINE(XINE_MACOSX_UNIVERSAL_BINARY, 1, [Define this if a universal binary is being built for Mac OS X]) for arch in $UNIVERSAL_ARCHES ; do UNIVERSAL_CFLAGS="$UNIVERSAL_CFLAGS -arch $arch" UNIVERSAL_LDFLAGS="$UNIVERSAL_LDFLAGS -arch $arch" - CFLAGS="$CFLAGS -arch $arch" - OBJCFLAGS="$OBJCFLAGS -arch $arch" - LDFLAGS="$LDFLAGS -arch $arch" done fi fi -- cgit v1.2.3