diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 44 |
1 files changed, 25 insertions, 19 deletions
@@ -671,7 +671,6 @@ CPPFLAGS ac_ct_CC EXEEXT OBJEXT -ARCHFLAGS CPP GREP EGREP @@ -1294,6 +1293,7 @@ Optional Features: getaddrinfo available] --enable-optimizer-dbg build optimizer debugging code --enable-yydebug build parser debugging code + --disable-universal don't build universal --enable-bluetooth enable Bluetooth support [default=yes, if support available] --enable-can enable CAN support [default=yes, if support @@ -1303,7 +1303,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-gcc don't use gcc - --with-arch-flags=FLAGS Use FLAGS to specify the target architecture(s) --with-sita include SITA support --with-pcap=TYPE use packet capture TYPE --without-libnl disable libnl support [default=yes, on Linux, if @@ -2907,21 +2906,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Check whether --with-arch-flags was given. -if test "${with_arch_flags+set}" = set; then - withval=$with_arch_flags; - if test "$withval" = "yes" - then - { { echo "$as_me:$LINENO: error: No flags specified for --with-arch-flags" >&5 -echo "$as_me: error: No flags specified for --with-arch-flags" >&2;} - { (exit 1); exit 1; }; } - fi - ARCHFLAGS="$withval" - - -fi - - @@ -9557,6 +9541,29 @@ echo "${ECHO_T}yes" >&6; } darwin*) DYEXT="dylib" V_CCOPT="$V_CCOPT -fno-common" + # Check whether --enable-universal was given. +if test "${enable_universal+set}" = set; then + enableval=$enable_universal; +fi + + if test "$enable_universal" != "no"; then + case "$host_os" in + + darwin10.3*) + # + # Snow Leopard. Build for x86-64, x86, and + # PPC, with x86-64 first. (That's what Apple + # does, even though Snow Leopard doesn't + # run on PPC, so PPC libpcap runs under + # Rosetta, and Rosetta doesn't support BPF + # ioctls, so PPC programs can't do live + # captures. + # + V_CCOPT="$V_CCOPT -arch x86_64 -arch i386 -arch ppc" + LDFLAGS="$LDFLAGS -arch x86_64 -arch i386 -arch ppc" + ;; + esac + fi ;; hpux9*) @@ -11425,7 +11432,6 @@ CPPFLAGS!$CPPFLAGS$ac_delim ac_ct_CC!$ac_ct_CC$ac_delim EXEEXT!$EXEEXT$ac_delim OBJEXT!$OBJEXT$ac_delim -ARCHFLAGS!$ARCHFLAGS$ac_delim CPP!$CPP$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim @@ -11461,7 +11467,7 @@ INSTALL_DATA!$INSTALL_DATA$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |