#! /bin/sh
-# From configure.in Id.
+# From configure.in Id: configure.in 65489 2010-09-09 20:59:10Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2.
#
--enable-permissive compile code disregarding strict ANSI
--enable-no_deps create code without dependency information
--disable-vararg_macros don't use vararg macros, even if they are supported
- --enable-universal_binary create Mac PowerPC and Intel Universal binary
+ --enable-universal_binary create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) architectures
+ --enable-macosx_arch=ARCH build for just the specified architecture
--enable-compat26 enable wxWidgets 2.6 compatibility
--disable-compat28 disable wxWidgets 2.8 compatibility
--disable-rpath disable use of rpath for uninstalled builds
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+DEFAULT_wxUSE_MAC_ARCH=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
echo "${ECHO_T}$result" >&6; }
+
enablestring=
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; }
echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
+ enablestring=
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-macosx_arch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-macosx_arch... $ECHO_C" >&6; }
+ # Check whether --enable-macosx_arch was given.
+if test "${enable_macosx_arch+set}" = set; then
+ enableval=$enable_macosx_arch;
+ wx_cv_use_macosx_arch="wxUSE_MAC_ARCH='$enableval'"
+
+else
+
+ wx_cv_use_macosx_arch='wxUSE_MAC_ARCH='$DEFAULT_wxUSE_MAC_ARCH
+
+fi
+
+
+ eval "$wx_cv_use_macosx_arch"
+
+ { echo "$as_me:$LINENO: result: $wxUSE_MAC_ARCH" >&5
+echo "${ECHO_T}$wxUSE_MAC_ARCH" >&6; }
+
+
enablestring=
defaultval=
else
ac_cv_prog_gcc_traditional=no
fi
-rm -f conftest*
+rm -f -r conftest*
if test $ac_cv_prog_gcc_traditional = no; then
$EGREP "$ac_pattern" >/dev/null 2>&1; then
ac_cv_prog_gcc_traditional=yes
fi
-rm -f conftest*
+rm -f -r conftest*
fi
fi
retest_macosx_linking=no
+OSX_ARCH_OPTS=""
+if test "x$wxUSE_MAC_ARCH" != xno; then
+ OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH"
+fi
+
if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
# Implicitly turn on the new --with-macosx-sdk using the default
echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;}
fi
fi
- OSX_UNIV_OPTS="-arch ppc -arch i386"
- CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
- CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
- OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS"
- OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS"
- LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
+ OSX_ARCH_OPTS="-arch ppc -arch i386"
+ if test "$wxUSE_OSX_COCOA" = 1; then
+ OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64"
+ fi
+ { echo "$as_me:$LINENO: checking for universal binary architectures" >&5
+echo $ECHO_N "checking for universal binary architectures... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $OSX_ARCH_OPTS" >&5
+echo "${ECHO_T}$OSX_ARCH_OPTS" >&6; }
+
retest_macosx_linking=yes
{ echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5
bk_use_pch=no
fi
+CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
+CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
+OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
+OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS"
+LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
+
if test "x$wxUSE_MACOSX_SDK" = "xno"; then
wxUSE_MACOSX_SDK=
elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
else
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -f -r conftest*
fi
else
ac_cv_header_stdc=no
fi
-rm -f conftest*
+rm -f -r conftest*
fi
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <sys/types.h> /* for off_t */
- #include <stdio.h>
+#include <stdio.h>
int
main ()
{
-int (*fp) (FILE *, off_t, int) = fseeko;
- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
- #include <stdio.h>
+#include <stdio.h>
int
main ()
{
-int (*fp) (FILE *, off_t, int) = fseeko;
- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
;
return 0;
}
_ACEOF
;;
esac
-rm -f conftest*
+rm -f -r conftest*
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
# in glibc 2.1.3, but that breaks too many other things.
eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
+ for ac_extension in a so sl dylib la dll; do
if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
test -f "$ac_im_libdir/libX11.$ac_extension"; then
ac_im_usrlibdir=$ac_im_libdir; break
for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
+ for ac_extension in a so sl dylib la dll; do
if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
projects / wxWidgets.git / blobdiff