From: Jay Freeman (saurik) Date: Fri, 14 Jun 2013 07:36:59 +0000 (-0700) Subject: Further improvements to the autoconf scripting. X-Git-Tag: v0.9.500%b1~106 X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/66170b30c7577168b02b9980304f35026a94de1a Further improvements to the autoconf scripting. --- diff --git a/GNUmakefile.in b/GNUmakefile.in index fd53283..46d5c2f 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -109,7 +109,7 @@ filters += C header += JavaScript.hpp endif -cflags := -Wall -Werror -Wno-parentheses $(cflags) +cflags += -Werror cflags += -fno-common ifneq ($(srcdir),.) cflags += -I. @@ -169,8 +169,9 @@ code += ObjectiveC/Output.lo ObjectiveC/Replace.lo ObjectiveC/Library.lo Struct.hpp: $$($(objcxx) -print-prog-name=cc1obj) -print-objc-runtime-info $@ +endif -ifeq ($(CY_OBJECTIVEC_MACH),1) +ifeq ($(CY_MACH),1) code += Handler.lo cflags += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(dll)"' inject += Mach/Inject.lo @@ -183,7 +184,6 @@ Mach/Inject.lo: Trampoline.t.hpp Baton.hpp %.t.hpp: %.t.lo trampoline.sh $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir) -Xcompiler -nostdlib endif -endif all: $(all) diff --git a/autogen.sh b/autogen.sh index 60d4af0..512fa2a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -set -e -aclocal -automake -acf -libtoolize -ci +libtoolize -cif +aclocal -I m4 autoconf +automake -acf diff --git a/configure b/configure index a4a1b00..28c9c18 100755 --- a/configure +++ b/configure @@ -10,6 +10,8 @@ # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +# +# Copyright (C) 2009-2012 Jay Freeman (saurik) ## -------------------- ## ## M4sh Initialization. ## ## -------------------- ## @@ -632,10 +634,12 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS CY_ATTACH_GROUP -CY_OBJECTIVEC_MACH +CY_MACH ac_ct__NM _NM ac_ct__LIPO @@ -643,34 +647,37 @@ _LIPO ac_ct__OTOOL _OTOOL SO +LTFLAGS LTLIBICONV LIBICONV GNUSTEP_CONFIG CY_OBJECTIVEC LIBFFI_LIBS LIBFFI_CFLAGS +LTLIBAPR CY_EXECUTE WEBKIT_LIBS WEBKIT_CFLAGS -LTLIBAPR +am__fastdepOBJCXX_FALSE +am__fastdepOBJCXX_TRUE +OBJCXXDEPMODE ac_ct_OBJCXX OBJCXXFLAGS OBJCXX CXXCPP +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE ac_ct_CXX CXXFLAGS CXX -GIT GNUTAR -INSTALL_DATA -INSTALL_SCRIPT -INSTALL_PROGRAM GPERF FLEX BISON TIME +GIT _BASH -LTFLAGS GMAKE ifGNUmake PKG_CONFIG_LIBDIR @@ -684,7 +691,6 @@ NMEDIT DSYMUTIL MANIFEST_TOOL RANLIB -STRIP ac_ct_AR AR DLLTOOL @@ -698,6 +704,16 @@ FGREP EGREP GREP SED +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR OBJEXT EXEEXT ac_ct_CC @@ -714,6 +730,33 @@ build_vendor build_cpu build LIBTOOL +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM target_alias host_alias build_alias @@ -755,17 +798,18 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_static enable_shared with_pic enable_fast_install +enable_dependency_tracking with_gnu_ld with_sysroot enable_libtool_lock -enable_universal_binary with_frameworks -with_apr enable_javascript +with_apr enable_rpath with_libiconv_prefix ' @@ -784,6 +828,7 @@ PKG_CONFIG_LIBDIR BISON FLEX GPERF +GNUTAR CXX CXXFLAGS CCC @@ -1392,6 +1437,11 @@ _ACEOF cat <<\_ACEOF +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] @@ -1408,13 +1458,17 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-libtool-lock avoid locking (might break parallel builds) - --disable-universal-binary - do not build with universal binary support on Darwin --enable-javascript[=ENGINE] use a JavaScript runtime (currently the only available option for ENGINE is JavaScriptCore) @@ -1454,6 +1508,7 @@ Some influential environment variables: BISON GNU Project parser generator (yacc replacement) FLEX the fast lexical analyser generator GPERF perfect hash function generator + GNUTAR a very sticky lump of files CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor @@ -1541,6 +1596,8 @@ generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. + +Copyright (C) 2009-2012 Jay Freeman (saurik) _ACEOF exit fi @@ -2457,7 +2514,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -#AC_CONFIG_MACRO_DIR([m4]) + + ac_aux_dir= for ac_dir in . "$srcdir"/.; do @@ -2488,76 +2546,610 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - -macro_version='2.4.2' -macro_revision='1.3337' +am__api_version='1.13' +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + done +IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -ltmain="$ac_aux_dir/ltmain.sh" +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='cycript' + VERSION='0.9' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.2' +macro_revision='1.3337' + + + + + + + + + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 @@ -2653,6 +3245,69 @@ esac +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3442,6 +4097,134 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if ${ac_cv_path_SED+:} false; then : @@ -7315,6 +8098,10 @@ _lt_linker_boilerplate=`cat conftest.err` $RM -r conftest* +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= @@ -10855,6 +11642,14 @@ CC="$lt_save_CC" +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + @@ -10973,6 +11768,7 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5 $as_echo_n "checking for GNU make... " >&6; } if ${_cv_gnu_make_command+:} false; then : @@ -11001,14 +11797,12 @@ $as_echo "\"Not found\"" >&6; }; GMAKE=$_cv_gnu_make_command - if test "x$GMAKE" = x; then : as_fn_error $? "You need GNU make" "$LINENO" 5 fi -for ac_prog in bash -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 + +# Extract the first word of "bash", so it can be a program name with args. +set dummy bash; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path__BASH+:} false; then : @@ -11034,6 +11828,7 @@ done done IFS=$as_save_IFS + test -z "$ac_cv_path__BASH" && ac_cv_path__BASH="as_fn_error $? "missing \"bash\"" "$LINENO" 5" ;; esac fi @@ -11047,24 +11842,16 @@ $as_echo "no" >&6; } fi - test -n "$_BASH" && break -done - -if test "x$_BASH" = x; then : - as_fn_error $? "You need GNU bash" "$LINENO" 5 -fi -for ac_prog in time -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 +# Extract the first word of "git", so it can be a program name with args. +set dummy git; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_TIME+:} false; then : +if ${ac_cv_path_GIT+:} false; then : $as_echo_n "(cached) " >&6 else - case $TIME in + case $GIT in [\\/]* | ?:[\\/]*) - ac_cv_path_TIME="$TIME" # Let the user override the test with a path. + ac_cv_path_GIT="$GIT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11074,7 +11861,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GIT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -11085,25 +11872,64 @@ IFS=$as_save_IFS ;; esac fi -TIME=$ac_cv_path_TIME -if test -n "$TIME"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TIME" >&5 -$as_echo "$TIME" >&6; } +GIT=$ac_cv_path_GIT +if test -n "$GIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 +$as_echo "$GIT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$TIME" && break +# Extract the first word of "time", so it can be a program name with args. +set dummy time; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_TIME+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $TIME in + [\\/]* | ?:[\\/]*) + ac_cv_path_TIME="$TIME" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done + done +IFS=$as_save_IFS + + ;; +esac +fi +TIME=$ac_cv_path_TIME +if test -n "$TIME"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TIME" >&5 +$as_echo "$TIME" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison >= 2.3" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison >= 2.3" >&5 $as_echo_n "checking for bison >= 2.3... " >&6; } - if test -z "$BISON"; then + if test -z "$BISON"; then ac_path_BISON_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11115,7 +11941,11 @@ do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_BISON="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_BISON" || continue -as_awk_strverscmp=' +version=`$ac_path_BISON -V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'` + if ${version:+false} :; then : + +else + as_awk_strverscmp=' # Use only awk features that work with 7th edition Unix awk (1978). # My, what an old awk you have, Mr. Solaris! END { @@ -11175,21 +12005,20 @@ as_awk_strverscmp=' if (length(v1)) exit 2 } ' -as_arg_v1=`$ac_path_BISON -V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'` +as_arg_v1=$version as_arg_v2=2.3 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( 1) : ;; #( 0) : - ac_cv_path_BISON=$ac_path_BISON - ;; #( + ac_cv_path_BISON=$ac_path_BISON ;; #( 2) : - ac_cv_path_BISON=$ac_path_BISON - ;; #( + ac_cv_path_BISON=$ac_path_BISON ;; #( *) : ;; esac +fi $ac_path_BISON_found && break 3 done @@ -11199,23 +12028,40 @@ IFS=$as_save_IFS if test -z "$ac_cv_path_BISON"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need bison 2.3 or greater" "$LINENO" 5 - fi else ac_cv_path_BISON=$BISON fi - BISON=$ac_cv_path_BISON - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 + if true; then : + + BISON=$ac_cv_path_BISON + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 $as_echo "$BISON" >&6; } +else + if true; then : + + as_fn_error $? "You need bison 2.3 or greater" "$LINENO" 5 + +else + + BISON=: + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +fi + + - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flex >= 2.5.33" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flex >= 2.5.33" >&5 $as_echo_n "checking for flex >= 2.5.33... " >&6; } - if test -z "$FLEX"; then + if test -z "$FLEX"; then ac_path_FLEX_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11227,21 +12073,24 @@ do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FLEX="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FLEX" || continue -as_arg_v1=`$ac_path_FLEX --version | $SED -e '1 s/^[^0-9.]* \([0-9.]*\).*$/\1/p;d'` +version=`$ac_path_FLEX --version | $SED -e '1 s/^[^0-9.]* \([0-9.]*\).*$/\1/p;d'` + if ${version:+false} :; then : + +else + as_arg_v1=$version as_arg_v2=2.5.33 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( 1) : ;; #( 0) : - ac_cv_path_FLEX=$ac_path_FLEX - ;; #( + ac_cv_path_FLEX=$ac_path_FLEX ;; #( 2) : - ac_cv_path_FLEX=$ac_path_FLEX - ;; #( + ac_cv_path_FLEX=$ac_path_FLEX ;; #( *) : ;; esac +fi $ac_path_FLEX_found && break 3 done @@ -11251,23 +12100,40 @@ IFS=$as_save_IFS if test -z "$ac_cv_path_FLEX"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need flex 2.5.33 or greater" "$LINENO" 5 - fi else ac_cv_path_FLEX=$FLEX fi - FLEX=$ac_cv_path_FLEX - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 + if true; then : + + FLEX=$ac_cv_path_FLEX + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 $as_echo "$FLEX" >&6; } +else + if true; then : + + as_fn_error $? "You need flex 2.5.33 or greater" "$LINENO" 5 + +else + + FLEX=: + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +fi +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gperf >= 3.0.3" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gperf >= 3.0.3" >&5 $as_echo_n "checking for gperf >= 3.0.3... " >&6; } - if test -z "$GPERF"; then + if test -z "$GPERF"; then ac_path_GPERF_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11279,21 +12145,24 @@ do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GPERF="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GPERF" || continue -as_arg_v1=`$ac_path_GPERF --version | $SED -e '1 s/^.* \([0-9.]*\)$/\1/p;d'` +version=`$ac_path_GPERF --version | $SED -e '1 s/^.* \([0-9.]*\)$/\1/p;d'` + if ${version:+false} :; then : + +else + as_arg_v1=$version as_arg_v2=3.0.3 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( 1) : ;; #( 0) : - ac_cv_path_GPERF=$ac_path_GPERF - ;; #( + ac_cv_path_GPERF=$ac_path_GPERF ;; #( 2) : - ac_cv_path_GPERF=$ac_path_GPERF - ;; #( + ac_cv_path_GPERF=$ac_path_GPERF ;; #( *) : ;; esac +fi $ac_path_GPERF_found && break 3 done @@ -11303,114 +12172,40 @@ IFS=$as_save_IFS if test -z "$ac_cv_path_GPERF"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need gperf 3.0.3 or greater" "$LINENO" 5 - fi else ac_cv_path_GPERF=$GPERF fi - GPERF=$ac_cv_path_GPERF - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5 + if true; then : + + GPERF=$ac_cv_path_GPERF + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5 $as_echo "$GPERF" >&6; } -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac + if true; then : - done -IFS=$as_save_IFS + as_fn_error $? "You need gperf 3.0.3 or greater" "$LINENO" 5 -rm -rf conftest.one conftest.two conftest.dir +else + + GPERF=: + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU tar >=1.19" >&5 -$as_echo_n "checking for GNU tar >=1.19... " >&6; } -if test -z "$GNUTAR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tar gtar gnutar >= 1.19" >&5 +$as_echo_n "checking for tar gtar gnutar >= 1.19... " >&6; } + if test -z "$GNUTAR"; then ac_path_GNUTAR_found=false # Loop through the user's path and test for each of PROGNAME-LIST as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -11422,27 +12217,23 @@ do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GNUTAR="$as_dir/$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GNUTAR" || continue +version=`$ac_path_GNUTAR --version | $SED -e '1 s/^tar (GNU tar) \(.*\)$/\1/p;d'` + if ${version:+false} :; then : - if test "x`$ac_path_GNUTAR --version | $SED -e '1 s/^tar (GNU tar)/&/p;d'`" != x; then : - - as_arg_v1=`$ac_path_GNUTAR --version | $SED -e '1 s/^tar (GNU tar) \(.*\)$/\1/p;d'` +else + as_arg_v1=$version as_arg_v2=1.19 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( 1) : ;; #( 0) : - - ac_cv_path_GNUTAR=$ac_path_GNUTAR - ;; #( + ac_cv_path_GNUTAR=$ac_path_GNUTAR ;; #( 2) : - - ac_cv_path_GNUTAR=$ac_path_GNUTAR - ;; #( + ac_cv_path_GNUTAR=$ac_path_GNUTAR ;; #( *) : ;; esac - fi $ac_path_GNUTAR_found && break 3 @@ -11451,68 +12242,38 @@ fi done IFS=$as_save_IFS if test -z "$ac_cv_path_GNUTAR"; then - : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi else ac_cv_path_GNUTAR=$GNUTAR fi -if test "x$ac_cv_path_GNUTAR" != x; then : - GNUTAR=$ac_cv_path_GNUTAR + if true; then : + + GNUTAR=$ac_cv_path_GNUTAR - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 $as_echo "$GNUTAR" >&6; } else + if true; then : - GNUTAR=: + as_fn_error $? "You need tar gtar gnutar 1.19 or greater" "$LINENO" 5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -fi -for ac_prog in git -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$GIT"; then - ac_cv_prog_GIT="$GIT" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GIT="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -GIT=$ac_cv_prog_GIT -if test -n "$GIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5 -$as_echo "$GIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + GNUTAR=: + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + +fi fi - test -n "$GIT" && break -done + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -11765,11 +12526,139 @@ else CXXFLAGS= fi fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +depcc="$CXX" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then + am__fastdepCXX_TRUE= + am__fastdepCXX_FALSE='#' +else + am__fastdepCXX_TRUE='#' + am__fastdepCXX_FALSE= +fi + @@ -11911,13 +12800,13 @@ as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -else +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +else _lt_caught_CXX_error=yes fi @@ -14963,11 +15852,11 @@ fi lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld fi # test "$_lt_caught_CXX_error" != yes -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_ext=mm @@ -15215,12 +16104,233 @@ else OBJCXXFLAGS= fi fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +depcc="$OBJCXX" am_compiler_list='gcc3 gcc' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_OBJCXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_OBJCXX_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_OBJCXX_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_OBJCXX_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_OBJCXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_OBJCXX_dependencies_compiler_type" >&6; } +OBJCXXDEPMODE=depmode=$am_cv_OBJCXX_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_OBJCXX_dependencies_compiler_type" = gcc3; then + am__fastdepOBJCXX_TRUE= + am__fastdepOBJCXX_FALSE='#' +else + am__fastdepOBJCXX_TRUE='#' + am__fastdepOBJCXX_FALSE= +fi + + + + + + + + + + + +if ${CFLAGS+:} false; then : + case " $CFLAGS " in + *" "*) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains "; } >&5 + (: CFLAGS already contains ) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; + *) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \""; } >&5 + (: CFLAGS="$CFLAGS ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + CFLAGS="$CFLAGS " + ;; + esac +else + CFLAGS="" +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for maximum warnings" >&5 +$as_echo_n "checking CFLAGS for maximum warnings... " >&6; } +if ${ac_cv_cflags_warn_all+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_cflags_warn_all="no, unknown" +ac_save_CFLAGS="$CFLAGS" +for ac_arg in "-warn all % -warn all" "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # +do CFLAGS="$ac_save_CFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_cflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +CFLAGS="$ac_save_CFLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags_warn_all" >&5 +$as_echo "$ac_cv_cflags_warn_all" >&6; } + +case ".$ac_cv_cflags_warn_all" in + .ok|.ok,*) ;; + .|.no|.no,*) ;; + *) if ${CFLAGS+:} false; then : + case " $CFLAGS " in + *" $ac_cv_cflags_warn_all "*) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$ac_cv_cflags_warn_all"; } >&5 + (: CFLAGS already contains $ac_cv_cflags_warn_all) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; + *) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$ac_cv_cflags_warn_all\""; } >&5 + (: CFLAGS="$CFLAGS $ac_cv_cflags_warn_all") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + CFLAGS="$CFLAGS $ac_cv_cflags_warn_all" + ;; + esac +else + CFLAGS="$ac_cv_cflags_warn_all" +fi + ;; +esac + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -15228,26 +16338,85 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -# Check whether --enable-universal-binary was given. -if test "${enable_universal_binary+set}" = set; then : - enableval=$enable_universal_binary; - case $enableval in #( - no) : - ;; #( - *) : +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for universal binary support" >&5 -$as_echo_n "checking for universal binary support... " >&6; } - case $host_vendor in #( - apple) : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for maximum warnings" >&5 +$as_echo_n "checking CXXFLAGS for maximum warnings... " >&6; } +if ${ac_cv_cxxflags_warn_all+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_cxxflags_warn_all="no, unknown" +ac_save_CXXFLAGS="$CXXFLAGS" +for ac_arg in "-warn all % -warn all" "-pedantic % -Wall" "-xstrconst % -v" "-std1 % -verbose -w0 -warnprotos" "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" "-ansi -ansiE % -fullwarn" "+ESlit % +w1" "-Xc % -pvctl,fullmsg" "-h conform % -h msglevel 2" # +do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - case $host_cpu in #( - armv6|i386|x86_64) : +int +main () +{ - for cy_arch in armv6 i386 x86_64; do - cy_save_CXXFLAGS=$CXXFLAGS + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_cxxflags_warn_all=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +CXXFLAGS="$ac_save_CXXFLAGS" - for element in "-arch $cy_arch"; do +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxxflags_warn_all" >&5 +$as_echo "$ac_cv_cxxflags_warn_all" >&6; } + +case ".$ac_cv_cxxflags_warn_all" in + .ok|.ok,*) ;; + .|.no|.no,*) ;; + *) if ${CXXFLAGS+:} false; then : + case " $CXXFLAGS " in + *" $ac_cv_cxxflags_warn_all "*) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS already contains \$ac_cv_cxxflags_warn_all"; } >&5 + (: CXXFLAGS already contains $ac_cv_cxxflags_warn_all) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; + *) + { { $as_echo "$as_me:${as_lineno-$LINENO}: : CXXFLAGS=\"\$CXXFLAGS \$ac_cv_cxxflags_warn_all\""; } >&5 + (: CXXFLAGS="$CXXFLAGS $ac_cv_cxxflags_warn_all") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + CXXFLAGS="$CXXFLAGS $ac_cv_cxxflags_warn_all" + ;; + esac +else + CXXFLAGS="$ac_cv_cxxflags_warn_all" +fi + ;; +esac + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-overloaded-virtual" >&5 +$as_echo_n "checking for -Wno-overloaded-virtual... " >&6; } + + cy_save=$CXXFLAGS + + for element in -Wno-overloaded-virtual; do haveit= for x in $CXXFLAGS; do @@ -15269,23 +16438,149 @@ $as_echo_n "checking for universal binary support... " >&6; } fi done - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int -main () -{ +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + + for element in -Wno-overloaded-virtual; do + haveit= + for x in $CFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + fi + done + + + for element in -Wno-overloaded-virtual; do + haveit= + for x in $CXXFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + fi + done + + + for element in -Wno-overloaded-virtual; do + haveit= + for x in $OBJCCXXFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + fi + done + + + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-parentheses" >&5 +$as_echo_n "checking for -Wno-parentheses... " >&6; } + + cy_save=$CXXFLAGS + + for element in -Wno-parentheses; do + haveit= + for x in $CXXFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + fi + done + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ; - return 0; -} _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - for element in $cy_arch; do + for element in -Wno-parentheses; do haveit= - for x in $cy_arches; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -15301,12 +16596,111 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi done if test -z "$haveit"; then - cy_arches="${cy_arches}${cy_arches:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done - for element in "-arch $cy_arch"; do + for element in -Wno-parentheses; do + haveit= + for x in $CXXFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + fi + done + + + for element in -Wno-parentheses; do + haveit= + for x in $OBJCCXXFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" + fi + done + + + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-unneeded-internal-declaration" >&5 +$as_echo_n "checking for -Wno-unneeded-internal-declaration... " >&6; } + + cy_save=$CXXFLAGS + + for element in -Wno-unneeded-internal-declaration; do + haveit= + for x in $CXXFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" + fi + done + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + + for element in -Wno-unneeded-internal-declaration; do haveit= for x in $CFLAGS; do @@ -15329,9 +16723,9 @@ if ac_fn_cxx_try_link "$LINENO"; then : done - for element in "-arch $cy_arch"; do + for element in -Wno-unneeded-internal-declaration; do haveit= - for x in $LDFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -15347,14 +16741,14 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi done if test -z "$haveit"; then - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done - for element in "-arch $cy_arch"; do + for element in -Wno-unneeded-internal-declaration; do haveit= - for x in $OBJCXXFLAGS; do + for x in $OBJCCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -15370,44 +16764,24 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi done if test -z "$haveit"; then - OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" + OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" fi done -else - - CXXFLAGS=$cy_save_CXXFLAGS +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done - ;; #( - *) : - ;; -esac - ;; #( - *) : - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${cy_arches-no}" >&5 -$as_echo "${cy_arches-no}" >&6; } - ;; -esac -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for universal binary support" >&5 -$as_echo_n "checking for universal binary support... " >&6; } - case $host_vendor in #( - apple) : - case $host_cpu in #( - armv6|i386|x86_64) : +for cy_arch in ppc ppc64 i386 x86_64 armv6; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -arch $cy_arch" >&5 +$as_echo_n "checking for -arch $cy_arch... " >&6; } - for cy_arch in armv6 i386 x86_64; do - cy_save_CXXFLAGS=$CXXFLAGS + cy_save=$CXXFLAGS for element in "-arch $cy_arch"; do haveit= @@ -15431,7 +16805,8 @@ $as_echo_n "checking for universal binary support... " >&6; } fi done - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -15443,11 +16818,22 @@ main () } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : + cy_good=1 +else + cy_good=0 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + CXXFLAGS=$cy_save + if test "x$cy_good" = x1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - for element in $cy_arch; do + for element in "-arch $cy_arch"; do haveit= - for x in $cy_arches; do + for x in $CFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -15463,14 +16849,14 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi done if test -z "$haveit"; then - cy_arches="${cy_arches}${cy_arches:+ }$element" + CFLAGS="${CFLAGS}${CFLAGS:+ }$element" fi done for element in "-arch $cy_arch"; do haveit= - for x in $CFLAGS; do + for x in $CXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -15486,14 +16872,14 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi done if test -z "$haveit"; then - CFLAGS="${CFLAGS}${CFLAGS:+ }$element" + CXXFLAGS="${CXXFLAGS}${CXXFLAGS:+ }$element" fi done for element in "-arch $cy_arch"; do haveit= - for x in $LDFLAGS; do + for x in $OBJCCXXFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -15509,14 +16895,15 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi done if test -z "$haveit"; then - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }$element" + OBJCCXXFLAGS="${OBJCCXXFLAGS}${OBJCCXXFLAGS:+ }$element" fi done + for element in "-arch $cy_arch"; do haveit= - for x in $OBJCXXFLAGS; do + for x in $LDFLAGS; do acl_save_prefix="$prefix" prefix="$acl_final_prefix" @@ -15532,37 +16919,23 @@ if ac_fn_cxx_try_link "$LINENO"; then : fi done if test -z "$haveit"; then - OBJCXXFLAGS="${OBJCXXFLAGS}${OBJCXXFLAGS:+ }$element" + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }$element" fi done else - - CXXFLAGS=$cy_save_CXXFLAGS - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done - ;; #( - *) : - ;; -esac - ;; #( - *) : - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${cy_arches-no}" >&5 -$as_echo "${cy_arches-no}" >&6; } - + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi +done # Check whether --with-frameworks was given. if test "${with_frameworks+set}" = set; then : withval=$with_frameworks; - for cy_framework in $withval; do + for cy_framework in $withval; do + for element in -F$cy_framework; do haveit= @@ -15632,159 +17005,23 @@ if test "${with_frameworks+set}" = set; then : fi done - done - -fi - - - apr_found="no" - - if test "$target_os" = "os2-emx"; then - # Scripts don't pass test -x on OS/2 - TEST_X="test -f" - else - TEST_X="test -x" - fi - - acceptable_majors="1" - - apr_temp_acceptable_apr_config="" - for apr_temp_major in $acceptable_majors - do - case $apr_temp_major in - 0) - apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config" - ;; - *) - apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config" - ;; - esac - done - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5 -$as_echo_n "checking for APR... " >&6; } - -# Check whether --with-apr was given. -if test "${with_apr+set}" = set; then : - withval=$with_apr; - if test "$withval" = "no" || test "$withval" = "yes"; then - as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5 - fi - - for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config - do - for lookdir in "$withval/bin" "$withval" - do - if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then - apr_config="$lookdir/$apr_temp_apr_config_file" - apr_found="yes" - break 2 - fi - done done - if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then - apr_config="$withval" - apr_found="yes" - fi - - if test "$apr_found" != "yes"; then - as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5 - fi - -else - - if test -n "1" && test "1" = "1"; then - for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config - do - if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then - apr_config="$apr_temp_apr_config_file" - - apr_found="yes" - break - else - for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do - if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then - apr_config="$lookdir/bin/$apr_temp_apr_config_file" - - apr_found="yes" - break 2 - fi - done - fi - done - fi - if test "$apr_found" = "no" && test -d ""; then - apr_temp_abs_srcdir="`cd && pwd`" - apr_found="reconfig" - apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`" - case $apr_bundled_major in - "") - as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5 - ;; - 0) - apr_temp_apr_config_file="apr-config" - ;; - *) - apr_temp_apr_config_file="apr-$apr_bundled_major-config" - ;; - esac - if test -n ""; then - apr_config="/$apr_temp_apr_config_file" - else - apr_config="/$apr_temp_apr_config_file" - fi - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5 -$as_echo "$apr_found" >&6; } - -case $apr_found in #( - yes) : - - - for element in `$apr_config --includes`; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - LTLIBAPR=`$apr_config --link-libtool` - - ;; #( - *) : - as_fn_error $? "You need apr" "$LINENO" 5 ;; -esac # Check whether --enable-javascript was given. if test "${enable_javascript+set}" = set; then : enableval=$enable_javascript; - case $enableval in #( + case $enableval in #( yes) : + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 $as_echo_n "checking for WEBKIT... " >&6; } @@ -15912,12 +17149,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -15961,7 +17200,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -15981,12 +17223,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -16030,7 +17274,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -16040,7 +17287,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags WebKitGtk`; do haveit= @@ -16164,12 +17412,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -16213,7 +17463,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -16233,12 +17486,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -16282,7 +17537,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -16292,7 +17550,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags WebKitGtk`; do haveit= @@ -16348,7 +17607,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags webkit-1.0`; do haveit= @@ -16397,13 +17657,11 @@ $as_echo "yes" >&6; } fi - ;; #( no) : - CY_EXECUTE=0 - - ;; #( + CY_EXECUTE=0 + ;; #( JavaScriptCore) : @@ -16535,12 +17793,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -16584,7 +17844,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -16604,12 +17867,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -16653,7 +17918,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -16663,7 +17931,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags WebKitGtk`; do haveit= @@ -16787,12 +18056,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -16836,7 +18107,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -16856,12 +18130,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -16905,7 +18181,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -16915,7 +18194,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags WebKitGtk`; do haveit= @@ -16971,7 +18251,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags webkit-1.0`; do haveit= @@ -17020,8 +18301,7 @@ $as_echo "yes" >&6; } fi - - ;; #( + ;; #( *) : as_fn_error $? "Unknown JavaScript engine: $enableval" "$LINENO" 5 ;; esac @@ -17157,12 +18437,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -17206,7 +18488,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -17226,12 +18511,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -17275,7 +18562,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -17285,7 +18575,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags WebKitGtk`; do haveit= @@ -17409,12 +18700,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -17458,7 +18751,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -17478,12 +18774,14 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () { -JSEvaluateScript(0, 0, 0, 0, 0, 0); + + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ; return 0; } @@ -17527,7 +18825,10 @@ $as_echo "$ac_cv_framework_JavaScriptCore" >&6; } fi done - CY_EXECUTE=1 + + CY_EXECUTE=1 + + fi @@ -17537,7 +18838,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags WebKitGtk`; do haveit= @@ -17593,7 +18895,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CY_EXECUTE=1 + CY_EXECUTE=1 + for element in `$PKG_CONFIG --cflags webkit-1.0`; do haveit= @@ -17643,17 +18946,157 @@ $as_echo "yes" >&6; } fi +fi + + + + apr_found="no" + + if test "$target_os" = "os2-emx"; then + # Scripts don't pass test -x on OS/2 + TEST_X="test -f" + else + TEST_X="test -x" + fi + + acceptable_majors="1" + + apr_temp_acceptable_apr_config="" + for apr_temp_major in $acceptable_majors + do + case $apr_temp_major in + 0) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config" + ;; + *) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config" + ;; + esac + done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for APR" >&5 +$as_echo_n "checking for APR... " >&6; } + +# Check whether --with-apr was given. +if test "${with_apr+set}" = set; then : + withval=$with_apr; + if test "$withval" = "no" || test "$withval" = "yes"; then + as_fn_error $? "--with-apr requires a directory or file to be provided" "$LINENO" 5 + fi + + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + for lookdir in "$withval/bin" "$withval" + do + if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then + apr_config="$lookdir/$apr_temp_apr_config_file" + + apr_found="yes" + break 2 + fi + done + done + + if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then + apr_config="$withval" + apr_found="yes" + fi + + if test "$apr_found" != "yes"; then + as_fn_error $? "the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file." "$LINENO" 5 + fi + +else + + if test -n "1" && test "1" = "1"; then + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then + apr_config="$apr_temp_apr_config_file" + + apr_found="yes" + break + else + for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do + if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then + apr_config="$lookdir/bin/$apr_temp_apr_config_file" + + apr_found="yes" + break 2 + fi + done + fi + done + fi + if test "$apr_found" = "no" && test -d ""; then + apr_temp_abs_srcdir="`cd && pwd`" + apr_found="reconfig" + apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"/include/apr_version.h\"`" + case $apr_bundled_major in + "") + as_fn_error $? "failed to find major version of bundled APR" "$LINENO" 5 + ;; + 0) + apr_temp_apr_config_file="apr-config" + ;; + *) + apr_temp_apr_config_file="apr-$apr_bundled_major-config" + ;; + esac + if test -n ""; then + apr_config="/$apr_temp_apr_config_file" + else + apr_config="/$apr_temp_apr_config_file" + fi + fi fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $apr_found" >&5 +$as_echo "$apr_found" >&6; } + +case $apr_found in #( + yes) : + + + for element in `$apr_config --includes`; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + LTLIBAPR=`$apr_config --link-libtool` + + ;; #( + *) : + as_fn_error $? "missing \"libapr\"" "$LINENO" 5 ;; +esac + + + case $CY_EXECUTE in #( 1) : - - for ac_header in ffi.h ffi/ffi.h + for ac_header in ffi.h ffi/ffi.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -17666,7 +19109,7 @@ fi done - if test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno; then : + if test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno; then : @@ -17726,15 +19169,11 @@ fi # Put the nasty error message in config.log where it belongs echo "$LIBFFI_PKG_ERRORS" >&5 - - as_fn_error $? "You need libffi" "$LINENO" 5 - + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - - as_fn_error $? "You need libffi" "$LINENO" 5 - + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 else LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS @@ -17790,10 +19229,9 @@ $as_echo "yes" >&6; } fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ffi_call" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ffi_call" >&5 $as_echo_n "checking for library containing ffi_call... " >&6; } if ${ac_cv_search_ffi_call+:} false; then : $as_echo_n "(cached) " >&6 @@ -17849,7 +19287,7 @@ if test "$ac_res" != no; then : fi - case $ac_cv_search_ffi_call in #( + case $ac_cv_search_ffi_call in #( no) : @@ -17909,15 +19347,11 @@ fi # Put the nasty error message in config.log where it belongs echo "$LIBFFI_PKG_ERRORS" >&5 - - as_fn_error $? "You need libffi" "$LINENO" 5 - + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - - as_fn_error $? "You need libffi" "$LINENO" 5 - + as_fn_error $? "missing \"libffi\"" "$LINENO" 5 else LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS @@ -17971,31 +19405,30 @@ $as_echo "yes" >&6; } done -fi - ;; #( +fi ;; #( *) : ;; esac fi - ac_ext=mm + + ac_ext=mm ac_cpp='$OBJCXXCPP $CPPFLAGS' ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we really have Objective C++" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we really have Objective C++" >&5 $as_echo_n "checking if we really have Objective C++... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - // This space intentionally left blank - _ACEOF if ac_fn_objcxx_try_compile "$LINENO"; then : - CY_OBJECTIVEC=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + CY_OBJECTIVEC=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else @@ -18003,7 +19436,8 @@ else $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "x$CY_OBJECTIVEC" = x1; then : + + if test "x$CY_OBJECTIVEC" = x1; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework CoreFoundation" >&5 @@ -18017,7 +19451,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () @@ -18070,6 +19504,7 @@ $as_echo "$ac_cv_framework_CoreFoundation" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework Foundation" >&5 $as_echo_n "checking for framework Foundation... " >&6; } if ${ac_cv_framework_Foundation+:} false; then : @@ -18081,7 +19516,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () @@ -18138,6 +19573,7 @@ _ACEOF fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for framework WebKit" >&5 $as_echo_n "checking for framework WebKit... " >&6; } if ${ac_cv_framework_WebKit+:} false; then : @@ -18149,7 +19585,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - #include + #include int main () @@ -18209,7 +19645,7 @@ fi else - for ac_prog in gnustep-config + for ac_prog in gnustep-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -18251,7 +19687,8 @@ fi test -n "$GNUSTEP_CONFIG" && break done - if test "x$GNUSTEP_CONFIG" != x; then : + + if test "x$GNUSTEP_CONFIG" != x; then : @@ -18309,7 +19746,8 @@ fi fi fi - ac_ext=cpp + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -18320,6 +19758,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ;; esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5 $as_echo_n "checking for a readline compatible library... " >&6; } if ${ax_cv_lib_readline+:} false; then : @@ -18449,10 +19888,11 @@ done case $vl_cv_lib_readline in #( no) : - as_fn_error $? "You need readline" "$LINENO" 5 ;; #( + as_fn_error $? "missing \"libreadline\"" "$LINENO" 5 ;; #( *) : ;; esac + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19464,8 +20904,8 @@ case $am_cv_func_iconv in #( ;; #( *) : - for cy_iconv_prefix_arg in $CFLAGS $CXXFLAGS $OBJCXXFLAGS $LDFLAGS $LIBS; do - case $cy_iconv_prefix_arg in #( + for cy_iconv_prefix_arg in $CFLAGS $CXXFLAGS $OBJCXXFLAGS $LDFLAGS $LIBS; do + case $cy_iconv_prefix_arg in #( -I*) : @@ -19491,7 +20931,7 @@ case $am_cv_func_iconv in #( fi done - ;; #( + ;; #( -L*) : @@ -19517,13 +20957,13 @@ case $am_cv_func_iconv in #( fi done - ;; #( + ;; #( *) : ;; esac - done - for with_libiconv_prefix in $cy_iconv_prefixes; do - { am_cv_func_iconv=; unset am_cv_func_iconv;} + done + for with_libiconv_prefix in $cy_iconv_prefixes; do + { am_cv_func_iconv=; unset am_cv_func_iconv;} @@ -19991,14 +21431,14 @@ fi - done + done ;; esac case $am_cv_func_iconv in #( yes) : ;; #( *) : - as_fn_error $? "You need iconv" "$LINENO" 5 ;; + as_fn_error $? "missing \"libiconv\"" "$LINENO" 5 ;; esac ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -20006,14 +21446,15 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + SO=$acl_shlibext -if test "x$CY_OBJECTIVEC" = x1; then : - ac_fn_cxx_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" +ac_fn_cxx_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" if test "x$ac_cv_header_mach_mach_h" = xyes; then : - if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then for ac_prog in otool do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -20101,7 +21542,7 @@ fi done if test "x$ac_ct__OTOOL" = x; then - _OTOOL="" + _OTOOL="as_fn_error $? "missing \"otool\"" "$LINENO" 5" else case $cross_compiling:$ac_tool_warned in yes:) @@ -20113,10 +21554,7 @@ esac fi fi - if test "x$_OTOOL" = x; then : - as_fn_error $? "You need otool" "$LINENO" 5 -fi - if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then for ac_prog in lipo do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -20204,7 +21642,7 @@ fi done if test "x$ac_ct__LIPO" = x; then - _LIPO="" + _LIPO="as_fn_error $? "missing \"lipo\"" "$LINENO" 5" else case $cross_compiling:$ac_tool_warned in yes:) @@ -20216,10 +21654,7 @@ esac fi fi - if test "x$_LIPO" = x; then : - as_fn_error $? "You need lipo" "$LINENO" 5 -fi - if test -n "$ac_tool_prefix"; then + if test -n "$ac_tool_prefix"; then for ac_prog in nm do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. @@ -20307,7 +21742,7 @@ fi done if test "x$ac_ct__NM" = x; then - _NM="" + _NM="as_fn_error $? "missing \"nm\"" "$LINENO" 5" else case $cross_compiling:$ac_tool_warned in yes:) @@ -20319,27 +21754,23 @@ esac fi fi - if test "x$_NM" = x; then : - as_fn_error $? "You need nm" "$LINENO" 5 -fi - CY_OBJECTIVEC_MACH=1 + CY_MACH=1 - CY_ATTACH_GROUP=procmod + CY_ATTACH_GROUP=procmod fi -fi if test "x$GMAKE" != xmake; then : - ac_config_files="$ac_config_files Makefile" - + ac_config_files="$ac_config_files Makefile" fi ac_config_files="$ac_config_files GNUmakefile" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -20485,6 +21916,38 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepOBJCXX_TRUE}" && test -z "${am__fastdepOBJCXX_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepOBJCXX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -20951,6 +22414,8 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' test -n "\$AWK" || AWK=awk _ACEOF @@ -21046,6 +22511,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -21430,6 +22896,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 for ac_config_target in $ac_config_targets do case $ac_config_target in + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; @@ -21772,6 +23239,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -21826,6 +23298,7 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ @@ -21856,6 +23329,99 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; "libtool":C) # See if we are running on zsh, and set the options which allow our diff --git a/configure.ac b/configure.ac index 28b4801..5d76d47 100644 --- a/configure.ac +++ b/configure.ac @@ -1,217 +1,259 @@ AC_PREREQ([2.65]) AC_INIT([Cycript], [0.9], [saurik@saurik.com], [cycript], [http://www.cycript.org/]) +AC_COPYRIGHT([Copyright (C) 2009-2012 Jay Freeman (saurik)]) + AC_CONFIG_SRCDIR([Console.cpp]) AC_CONFIG_AUX_DIR([.]) +AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE LT_INIT([disable-static]) + +AC_LANG([C++]) + PKG_PROG_PKG_CONFIG([0.22]) + AX_CHECK_GNU_MAKE AC_SUBST([GMAKE], [$_cv_gnu_make_command]) -AC_SUBST([LTFLAGS]) AS_IF([test "x$GMAKE" = x], [AC_MSG_ERROR([You need GNU make])]) -AC_PATH_PROGS([_BASH], [bash]) -AS_IF([test "x$_BASH" = x], [AC_MSG_ERROR([You need GNU bash])]) -AC_PATH_PROGS([TIME], [time]) + +AC_PATH_PROG([_BASH], [bash], [AC_MSG_ERROR([missing "bash"])]) +AC_PATH_PROG([GIT], [git]) +AC_PATH_PROG([TIME], [time]) + +dnl CY_CHECK_PROGS_VERSION {{{ AC_DEFUN([CY_CHECK_PROGS_VERSION], [ - AC_MSG_CHECKING(for ]$2[ >= ]$5[) - AC_PATH_PROGS_FEATURE_CHECK(]$1[, ]$3[, - AS_VERSION_COMPARE(`$ac_path_]$1[ ]$4[`, ]$5[, , - ac_cv_path_]$1[=$ac_path_]$1[ - , - ac_cv_path_]$1[=$ac_path_]$1[ - ) - , - AC_MSG_RESULT(no) - AC_MSG_ERROR(You need ]$2[ ]$5[ or greater) - ) - AC_SUBST(]$1[, $ac_cv_path_]$1[) - AC_MSG_RESULT($]$1[) -]) -AC_ARG_VAR([BISON], [GNU Project parser generator (yacc replacement)]) -CY_CHECK_PROGS_VERSION([BISON], [bison], [bison], - [-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [2.3]) -AC_ARG_VAR([FLEX], [the fast lexical analyser generator]) -CY_CHECK_PROGS_VERSION([FLEX], [flex], [flex], - [--version | $SED -e '1 s/^@<:@^0-9.@:>@* \(@<:@0-9.@:>@*\).*$/\1/p;d'], [2.5.33]) -AC_ARG_VAR([GPERF], [perfect hash function generator]) -CY_CHECK_PROGS_VERSION([GPERF], [gperf], [gperf], - [--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [3.0.3]) + AC_ARG_VAR(]$1[, ]$3[) + + AC_MSG_CHECKING(for ]$2[ >= ]$5[) + AC_PATH_PROGS_FEATURE_CHECK(]$1[, ]$2[, + AS_VAR_SET(version, [`$ac_path_]$1[ ]$4[`]) + AS_VAR_IF(version, [], , + AS_VERSION_COMPARE($version, ]$5[, , + ac_cv_path_]$1[=$ac_path_]$1[, + ac_cv_path_]$1[=$ac_path_]$1[)) + , AC_MSG_RESULT(no)) + + AS_IF([true], [ + AC_SUBST(]$1[, $ac_cv_path_]$1[) + AC_MSG_RESULT($]$1[) + ], AS_IF([true], [ + AC_MSG_ERROR(You need ]$2[ ]$5[ or greater) + ], [ + AC_SUBST(]$1[, [:]) + AC_MSG_RESULT([no]) + ])) +]) dnl }}} + +CY_CHECK_PROGS_VERSION([BISON], [bison], [GNU Project parser generator (yacc replacement)], + [-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [2.3]) +CY_CHECK_PROGS_VERSION([FLEX], [flex], [the fast lexical analyser generator], + [--version | $SED -e '1 s/^@<:@^0-9.@:>@* \(@<:@0-9.@:>@*\).*$/\1/p;d'], [2.5.33]) +CY_CHECK_PROGS_VERSION([GPERF], [gperf], [perfect hash function generator], + [--version | $SED -e '1 s/^.* \(@<:@0-9.@:>@*\)$/\1/p;d'], [3.0.3]) +CY_CHECK_PROGS_VERSION([GNUTAR], [tar gtar gnutar], [a very sticky lump of files], + [--version | $SED -e '1 s/^tar (GNU tar) \(.*\)$/\1/p;d'], [1.19]) + AC_PROG_INSTALL -AC_MSG_CHECKING([for GNU tar >=1.19]) -AC_PATH_PROGS_FEATURE_CHECK([GNUTAR], [tar gtar gnutar], [ - AS_IF([test "x`$ac_path_GNUTAR --version | $SED -e '1 s/^tar (GNU tar)/&/p;d'`" != x], [ - AS_VERSION_COMPARE([`$ac_path_GNUTAR --version | $SED -e '1 s/^tar (GNU tar) \(.*\)$/\1/p;d'`], [1.19], , [ - ac_cv_path_GNUTAR=$ac_path_GNUTAR - ], [ - ac_cv_path_GNUTAR=$ac_path_GNUTAR - ]) - ]) -]) -AS_IF([test "x$ac_cv_path_GNUTAR" != x], [ - AC_SUBST([GNUTAR], [$ac_cv_path_GNUTAR]) - AC_MSG_RESULT([$GNUTAR]) -], [ - AC_SUBST([GNUTAR], [:]) - AC_MSG_RESULT([no]) -]) -AC_CHECK_PROGS([GIT], [git]) + AC_PROG_CXX AC_PROG_OBJCXX -AC_LANG([C++]) -AC_DEFUN([CY_CHECK_UNIVERSAL], [ - AC_MSG_CHECKING([for universal binary support]) - AS_CASE([$host_vendor], [apple], [ - AS_CASE([$host_cpu], [armv6|i386|x86_64], [ - for cy_arch in armv6 i386 x86_64; do - cy_save_CXXFLAGS=$CXXFLAGS - AC_LIB_APPENDTOVAR([CXXFLAGS], ["-arch $cy_arch"]) - AC_TRY_LINK([], [], [ - AC_LIB_APPENDTOVAR([cy_arches], [$cy_arch]) - AC_LIB_APPENDTOVAR([CFLAGS], ["-arch $cy_arch"]) - AC_LIB_APPENDTOVAR([LDFLAGS], ["-arch $cy_arch"]) - AC_LIB_APPENDTOVAR([OBJCXXFLAGS], ["-arch $cy_arch"]) - ], [ - CXXFLAGS=$cy_save_CXXFLAGS - ]) - done - ]) - ]) - AC_MSG_RESULT([${cy_arches-no}]) + +dnl CY_TRY {{{ +AC_DEFUN([CY_SUCCESS], [cy_good=1]) +AC_DEFUN([CY_FAILURE], [cy_good=0]) + +AC_DEFUN([CY_TRY], [ + cy_save=$]$1[ + AC_LIB_APPENDTOVAR(]$1[, ]$2[) + ]$3[ + ]$1[=$cy_save + AS_IF([test "x$cy_good" = x1], ]$4[, ]$5[) +]) dnl }}} + +AC_DEFUN([CY_COMPILE_FLAG], [ + AC_LIB_APPENDTOVAR([CFLAGS], ]$1[) + AC_LIB_APPENDTOVAR([CXXFLAGS], ]$1[) + AC_LIB_APPENDTOVAR([OBJCCXXFLAGS], ]$1[) ]) -AC_ARG_ENABLE([universal-binary], [AS_HELP_STRING( - [--disable-universal-binary], - [do not build with universal binary support on Darwin] -)], [ - AS_CASE([$enableval], [no], [], [CY_CHECK_UNIVERSAL]) -], [CY_CHECK_UNIVERSAL]) + +AC_DEFUN([CY_TEST_FLAG], [ + AC_MSG_CHECKING([for ]]$1[) + CY_TRY([CXXFLAGS], $1, [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], + [CY_SUCCESS], [CY_FAILURE]) + ], [ + AC_MSG_RESULT([yes]) + CY_COMPILE_FLAG($1) + ], [AC_MSG_RESULT([no])]) +]) + +AX_CFLAGS_WARN_ALL +AX_CXXFLAGS_WARN_ALL + +CY_TEST_FLAG([-Wno-overloaded-virtual]) +CY_TEST_FLAG([-Wno-parentheses]) +CY_TEST_FLAG([-Wno-unneeded-internal-declaration]) + +dnl -arch * {{{ +for cy_arch in ppc ppc64 i386 x86_64 armv6; do + AC_MSG_CHECKING([for -arch $cy_arch]) + CY_TRY([CXXFLAGS], ["-arch $cy_arch"], [ + AC_TRY_LINK([], [], [CY_SUCCESS], [CY_FAILURE]) + ], [ + AC_MSG_RESULT([yes]) + CY_COMPILE_FLAG(["-arch $cy_arch"]) + AC_LIB_APPENDTOVAR([LDFLAGS], ["-arch $cy_arch"]) + ], [AC_MSG_RESULT([no])]) +done dnl }}} + +dnl --with-frameworks {{{ AC_ARG_WITH([frameworks], [AS_HELP_STRING( - [--with-frameworks=DIRS], - [add to DIRS (space separated) to the Darwin include path for frameworks with -F] + [--with-frameworks=DIRS], + [add to DIRS (space separated) to the Darwin include path for frameworks with -F] )], [ - for cy_framework in $withval; do - AC_LIB_APPENDTOVAR([CFLAGS], [-F$cy_framework]) - AC_LIB_APPENDTOVAR([CXXFLAGS], [-F$cy_framework]) - AC_LIB_APPENDTOVAR([OBJCCXXFLAGS], [-F$cy_framework]) - done -]) -APR_FIND_APR([], [], [1], [1]) -AS_CASE([$apr_found], [yes], [ - AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`]) - AC_SUBST([LTLIBAPR], [`$apr_config --link-libtool`]) -], [AC_MSG_ERROR([You need apr])]) + for cy_framework in $withval; do + CY_COMPILE_FLAG([-F$cy_framework]) + done +]) dnl }}} +dnl --enable-javascript {{{ AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [ - PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [ - CY_EXECUTE=1 - AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags webkit-1.0`]) - AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs webkit-1.0`]) - ], [ - PKG_CHECK_MODULES([WEBKIT], [WebKitGtk], [ - CY_EXECUTE=1 - AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags WebKitGtk`]) - AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs WebKitGtk`]) - ], [ - AC_CHECK_FRAMEWORK([JavaScriptCore], [ - #include - ], [JSEvaluateScript(0, 0, 0, 0, 0, 0);], [CY_EXECUTE=1]) - ]) - ]) + PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [ + AC_SUBST([CY_EXECUTE], [1]) + AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags webkit-1.0`]) + AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs webkit-1.0`]) + ], [ + PKG_CHECK_MODULES([WEBKIT], [WebKitGtk], [ + AC_SUBST([CY_EXECUTE], [1]) + AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags WebKitGtk`]) + AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs WebKitGtk`]) + ], [ + AC_CHECK_FRAMEWORK([JavaScriptCore], [ + #include + ], [ + JSEvaluateScript(0, 0, 0, 0, 0, 0); + ], [ + AC_SUBST([CY_EXECUTE], [1]) + ]) + ]) + ]) ]) + AC_DEFUN([CY_CHECK_JAVASCRIPT], [ - CY_CHECK_JAVASCRIPTCORE -]) + CY_CHECK_JAVASCRIPTCORE]) + AC_ARG_ENABLE([javascript], [AS_HELP_STRING( - [--enable-javascript@<:@=ENGINE@:>@], - [use a JavaScript runtime (currently the only available option for ENGINE is JavaScriptCore) @<:@default=yes@:>@] + [--enable-javascript@<:@=ENGINE@:>@], + [use a JavaScript runtime (currently the only available option for ENGINE is JavaScriptCore) @<:@default=yes@:>@] )], [ - AS_CASE([$enableval], [yes], [CY_CHECK_JAVASCRIPT], [no], [ - AC_SUBST([CY_EXECUTE], [0]) - ], [JavaScriptCore], [ - CY_CHECK_JAVASCRIPTCORE - ], [AC_MSG_ERROR([Unknown JavaScript engine: $enableval])]) + AS_CASE([$enableval], + [yes], [ + CY_CHECK_JAVASCRIPT], + [no], [ + AC_SUBST([CY_EXECUTE], [0])], + [JavaScriptCore], [ + CY_CHECK_JAVASCRIPTCORE], + [AC_MSG_ERROR([Unknown JavaScript engine: $enableval])]) ], [CY_CHECK_JAVASCRIPT]) +dnl }}} + +dnl APR_FIND_APR {{{ +APR_FIND_APR([], [], [1], [1]) +AS_CASE([$apr_found], [yes], [ + AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`]) + AC_SUBST([LTLIBAPR], [`$apr_config --link-libtool`]) +], [AC_MSG_ERROR([missing "libapr"])]) +dnl }}} + AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [ - PKG_CHECK_MODULES([LIBFFI], [libffi], [ - AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags libffi`]) - AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs libffi`]) - ], [ - AC_MSG_ERROR([You need libffi]) - ]) -]) + PKG_CHECK_MODULES([LIBFFI], [libffi], [ + AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags libffi`]) + AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs libffi`]) + ], [AC_MSG_ERROR([missing "libffi"])])]) + AS_CASE([$CY_EXECUTE], [1], [ - AC_SUBST([CY_EXECUTE]) - AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break]) - AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [ - CY_CHECK_PKG_CONFIG_LIBFFI - ], [ - AC_SEARCH_LIBS([ffi_call], [ffi]) - AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI]) - ]) - AC_LANG_PUSH([Objective C++]) - AC_MSG_CHECKING([if we really have Objective C++]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - // This space intentionally left blank - ])], [ - CY_OBJECTIVEC=1 - AC_MSG_RESULT([yes]) - ], [AC_MSG_RESULT([no])]) - AS_IF([test "x$CY_OBJECTIVEC" = x1], [ - AC_CHECK_FRAMEWORK([CoreFoundation], [ - #include - ], [CFAllocatorGetDefault();], [ - AC_SUBST([CY_OBJECTIVEC]) - AC_CHECK_FRAMEWORK([Foundation], [ - #include - ], [[[[NSObject alloc] init];]]) - AC_CHECK_FRAMEWORK([WebKit], [ - #include - ], [[[[WebScriptObject alloc] init];]]) - ], [ - AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation]) - AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config]) - AS_IF([test "x$GNUSTEP_CONFIG" != x], [ - AC_SUBST([CY_OBJECTIVEC]) - AC_LIB_APPENDTOVAR([OBJCXXFLAGS], [`$GNUSTEP_CONFIG --objc-flags`]) - AC_LIB_APPENDTOVAR([LIBS], [`$GNUSTEP_CONFIG --base-libs`]) - ], [AC_SUBST([CY_OBJECTIVEC], [0])]) - ]) - ]) - AC_LANG_POP([Objective C++]) + AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break]) + AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [ + CY_CHECK_PKG_CONFIG_LIBFFI + ], [ + AC_SEARCH_LIBS([ffi_call], [ffi]) + AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI]) + ]) + + AC_LANG_PUSH([Objective C++]) + + AC_MSG_CHECKING([if we really have Objective C++]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [ + CY_OBJECTIVEC=1 + AC_MSG_RESULT([yes]) + ], [AC_MSG_RESULT([no])]) + + AS_IF([test "x$CY_OBJECTIVEC" = x1], [ + AC_CHECK_FRAMEWORK([CoreFoundation], [ + #include + ], [CFAllocatorGetDefault();], [ + AC_SUBST([CY_OBJECTIVEC]) + + AC_CHECK_FRAMEWORK([Foundation], [ + #include + ], [[[[NSObject alloc] init];]]) + + AC_CHECK_FRAMEWORK([WebKit], [ + #include + ], [[[[WebScriptObject alloc] init];]]) + ], [ + AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation]) + AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config]) + + AS_IF([test "x$GNUSTEP_CONFIG" != x], [ + AC_SUBST([CY_OBJECTIVEC]) + AC_LIB_APPENDTOVAR([OBJCXXFLAGS], [`$GNUSTEP_CONFIG --objc-flags`]) + AC_LIB_APPENDTOVAR([LIBS], [`$GNUSTEP_CONFIG --base-libs`]) + ], [AC_SUBST([CY_OBJECTIVEC], [0])]) + ]) + ]) + + AC_LANG_POP([Objective C++]) ]) + VL_LIB_READLINE -AS_CASE([$vl_cv_lib_readline], [no], [AC_MSG_ERROR([You need readline])]) +AS_CASE([$vl_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])]) + +dnl XXX: saurik doesn't understand what this does +dnl AM_ICONV {{{ AC_LANG_PUSH([C]) AM_ICONV AS_CASE([$am_cv_func_iconv], [yes], [], [ - for cy_iconv_prefix_arg in $CFLAGS $CXXFLAGS $OBJCXXFLAGS $LDFLAGS $LIBS; do - AS_CASE([$cy_iconv_prefix_arg], [-I*], [ - AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-I//;s|/include$||'`]) - ], [-L*], [ - AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-L//;s|/lib$||'`]) - ]) - done - for with_libiconv_prefix in $cy_iconv_prefixes; do - AS_UNSET([am_cv_func_iconv]) - AM_ICONV_LINKFLAGS_BODY - AM_ICONV - done + for cy_iconv_prefix_arg in $CFLAGS $CXXFLAGS $OBJCXXFLAGS $LDFLAGS $LIBS; do + AS_CASE([$cy_iconv_prefix_arg], [-I*], [ + AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-I//;s|/include$||'`]) + ], [-L*], [ + AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-L//;s|/lib$||'`]) + ]) + done + for with_libiconv_prefix in $cy_iconv_prefixes; do + AS_UNSET([am_cv_func_iconv]) + AM_ICONV_LINKFLAGS_BODY + AM_ICONV + done ]) -AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])]) +AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([missing "libiconv"])]) AC_LANG_POP([C]) +dnl }}} + +AC_SUBST([LTFLAGS]) AC_SUBST([SO], [$acl_shlibext]) -AS_IF([test "x$CY_OBJECTIVEC" = x1], [ - AC_CHECK_HEADER([mach/mach.h], [ - AC_CHECK_TOOLS([_OTOOL], [otool]) - AS_IF([test "x$_OTOOL" = x], [AC_MSG_ERROR([You need otool])]) - AC_CHECK_TOOLS([_LIPO], [lipo]) - AS_IF([test "x$_LIPO" = x], [AC_MSG_ERROR([You need lipo])]) - AC_CHECK_TOOLS([_NM], [nm]) - AS_IF([test "x$_NM" = x], [AC_MSG_ERROR([You need nm])]) - AC_SUBST([CY_OBJECTIVEC_MACH], [1]) - AC_SUBST([CY_ATTACH_GROUP], [procmod]) - ]) + +AC_CHECK_HEADER([mach/mach.h], [ + AC_CHECK_TOOLS([_OTOOL], [otool], [AC_MSG_ERROR([missing "otool"])]) + AC_CHECK_TOOLS([_LIPO], [lipo], [AC_MSG_ERROR([missing "lipo"])]) + AC_CHECK_TOOLS([_NM], [nm], [AC_MSG_ERROR([missing "nm"])]) + AC_SUBST([CY_MACH], [1]) + AC_SUBST([CY_ATTACH_GROUP], [procmod]) ]) + AS_IF([test "x$GMAKE" != xmake], [ - AC_CONFIG_FILES([Makefile]) -]) + AC_CONFIG_FILES([Makefile])]) AC_CONFIG_FILES([GNUmakefile]) + AC_OUTPUT diff --git a/find_apr.m4 b/find_apr.m4 deleted file mode 100644 index 88f64a7..0000000 --- a/find_apr.m4 +++ /dev/null @@ -1,202 +0,0 @@ -dnl -------------------------------------------------------- -*- autoconf -*- -dnl Licensed to the Apache Software Foundation (ASF) under one or more -dnl contributor license agreements. See the NOTICE file distributed with -dnl this work for additional information regarding copyright ownership. -dnl The ASF licenses this file to You under the Apache License, Version 2.0 -dnl (the "License"); you may not use this file except in compliance with -dnl the License. You may obtain a copy of the License at -dnl -dnl http://www.apache.org/licenses/LICENSE-2.0 -dnl -dnl Unless required by applicable law or agreed to in writing, software -dnl distributed under the License is distributed on an "AS IS" BASIS, -dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -dnl See the License for the specific language governing permissions and -dnl limitations under the License. - -dnl -dnl find_apr.m4 : locate the APR include files and libraries -dnl -dnl This macro file can be used by applications to find and use the APR -dnl library. It provides a standardized mechanism for using APR. It supports -dnl embedding APR into the application source, or locating an installed -dnl copy of APR. -dnl -dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors, -dnl detailed-check) -dnl -dnl where srcdir is the location of the bundled APR source directory, or -dnl empty if source is not bundled. -dnl -dnl where builddir is the location where the bundled APR will will be built, -dnl or empty if the build will occur in the srcdir. -dnl -dnl where implicit-install-check set to 1 indicates if there is no -dnl --with-apr option specified, we will look for installed copies. -dnl -dnl where acceptable-majors is a space separated list of acceptable major -dnl version numbers. Often only a single major version will be acceptable. -dnl If multiple versions are specified, and --with-apr=PREFIX or the -dnl implicit installed search are used, then the first (leftmost) version -dnl in the list that is found will be used. Currently defaults to [0 1]. -dnl -dnl where detailed-check is an M4 macro which sets the apr_acceptable to -dnl either "yes" or "no". The macro will be invoked for each installed -dnl copy of APR found, with the apr_config variable set appropriately. -dnl Only installed copies of APR which are considered acceptable by -dnl this macro will be considered found. If no installed copies are -dnl considered acceptable by this macro, apr_found will be set to either -dnl either "no" or "reconfig". -dnl -dnl Sets the following variables on exit: -dnl -dnl apr_found : "yes", "no", "reconfig" -dnl -dnl apr_config : If the apr-config tool exists, this refers to it. If -dnl apr_found is "reconfig", then the bundled directory -dnl should be reconfigured *before* using apr_config. -dnl -dnl Note: this macro file assumes that apr-config has been installed; it -dnl is normally considered a required part of an APR installation. -dnl -dnl If a bundled source directory is available and needs to be (re)configured, -dnl then apr_found is set to "reconfig". The caller should reconfigure the -dnl (passed-in) source directory, placing the result in the build directory, -dnl as appropriate. -dnl -dnl If apr_found is "yes" or "reconfig", then the caller should use the -dnl value of apr_config to fetch any necessary build/link information. -dnl - -AC_DEFUN([APR_FIND_APR], [ - apr_found="no" - - if test "$target_os" = "os2-emx"; then - # Scripts don't pass test -x on OS/2 - TEST_X="test -f" - else - TEST_X="test -x" - fi - - ifelse([$4], [], [ - ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x])) - acceptable_majors="0 1"], - [acceptable_majors="$4"]) - - apr_temp_acceptable_apr_config="" - for apr_temp_major in $acceptable_majors - do - case $apr_temp_major in - 0) - apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config" - ;; - *) - apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config" - ;; - esac - done - - AC_MSG_CHECKING(for APR) - AC_ARG_WITH(apr, - [ --with-apr=PATH prefix for installed APR or the full path to - apr-config], - [ - if test "$withval" = "no" || test "$withval" = "yes"; then - AC_MSG_ERROR([--with-apr requires a directory or file to be provided]) - fi - - for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config - do - for lookdir in "$withval/bin" "$withval" - do - if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then - apr_config="$lookdir/$apr_temp_apr_config_file" - ifelse([$5], [], [], [ - apr_acceptable="yes" - $5 - if test "$apr_acceptable" != "yes"; then - AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable]) - continue - fi]) - apr_found="yes" - break 2 - fi - done - done - - if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then - apr_config="$withval" - ifelse([$5], [], [apr_found="yes"], [ - apr_acceptable="yes" - $5 - if test "$apr_acceptable" = "yes"; then - apr_found="yes" - fi]) - fi - - dnl if --with-apr is used, it is a fatal error for its argument - dnl to be invalid - if test "$apr_found" != "yes"; then - AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.]) - fi - ],[ - dnl If we allow installed copies, check those before using bundled copy. - if test -n "$3" && test "$3" = "1"; then - for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config - do - if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then - apr_config="$apr_temp_apr_config_file" - ifelse([$5], [], [], [ - apr_acceptable="yes" - $5 - if test "$apr_acceptable" != "yes"; then - AC_MSG_WARN([skipped APR at $apr_config, version not acceptable]) - continue - fi]) - apr_found="yes" - break - else - dnl look in some standard places - for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do - if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then - apr_config="$lookdir/bin/$apr_temp_apr_config_file" - ifelse([$5], [], [], [ - apr_acceptable="yes" - $5 - if test "$apr_acceptable" != "yes"; then - AC_MSG_WARN([skipped APR at $apr_config, version not acceptable]) - continue - fi]) - apr_found="yes" - break 2 - fi - done - fi - done - fi - dnl if we have not found anything yet and have bundled source, use that - if test "$apr_found" = "no" && test -d "$1"; then - apr_temp_abs_srcdir="`cd $1 && pwd`" - apr_found="reconfig" - apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`" - case $apr_bundled_major in - "") - AC_MSG_ERROR([failed to find major version of bundled APR]) - ;; - 0) - apr_temp_apr_config_file="apr-config" - ;; - *) - apr_temp_apr_config_file="apr-$apr_bundled_major-config" - ;; - esac - if test -n "$2"; then - apr_config="$2/$apr_temp_apr_config_file" - else - apr_config="$1/$apr_temp_apr_config_file" - fi - fi - ]) - - AC_MSG_RESULT($apr_found) -]) diff --git a/framework.m4 b/framework.m4 deleted file mode 100644 index 1de128f..0000000 --- a/framework.m4 +++ /dev/null @@ -1,50 +0,0 @@ -# AC_CHECK_FRAMEWORK(FRAMEWORK, PROLOGUE, BODY, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], -# [OTHER-LIBRARIES]) -# ------------------------------------------------------ -# -# Use a cache variable name containing both the framework and function name, -# because the test really is for framework $1 defining function $2, not -# just for framework $1. Separate tests with the same $1 and different $2s -# may have different results. -# -# Note that using directly AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1]) -# is asking for troubles, since AC_CHECK_FRAMEWORK($framework, fun) would give -# ac_cv_framework_$framework_fun, which is definitely not what was meant. Hence -# the AS_LITERAL_IF indirection. -# -# FIXME: This macro is extremely suspicious. It DEFINEs unconditionally, -# whatever the FUNCTION, in addition to not being a *S macro. Note -# that the cache does depend upon the function we are looking for. -# -# It is on purpose we used `ac_check_framework_save_LIBS' and not just -# `ac_save_LIBS': there are many macros which don't want to see `LIBS' -# changed but still want to use AC_CHECK_FRAMEWORK, so they save `LIBS'. -# And ``ac_save_LIBS' is too tempting a name, so let's leave them some -# freedom. -AC_DEFUN([AC_CHECK_FRAMEWORK], [ - m4_ifval([$4], , [AH_CHECK_FRAMEWORK([$1])])dnl - AS_LITERAL_IF([$1], [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])], - [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1''])] - )dnl - AC_CACHE_CHECK([for framework $1], ac_Framework, [ - ac_check_framework_save_LIBS=$LIBS - LIBS="-framework $1 $6 $LIBS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([$2], [$3])],[ - AS_VAR_SET(ac_Framework, yes) - ], [AS_VAR_SET(ac_Framework, no)]) - LIBS=$ac_check_framework_save_LIBS] - ) - AS_IF([test AS_VAR_GET(ac_Framework) = yes], [ - AC_LIB_APPENDTOVAR([LIBS], ["-framework $1 $LIBS"]) - m4_default([$4], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FRAMEWORK_$1))]) - ], [$5])dnl - AS_VAR_POPDEF([ac_Framework])dnl -])# AC_CHECK_FRAMEWORK - -# AH_CHECK_FRAMEWORK(FRAMEWORK) -# --------------------- -m4_define([AH_CHECK_FRAMEWORK], [ - AH_TEMPLATE(AS_TR_CPP(HAVE_FRAMEWORK_$1), - [Define to 1 if you have the `]$1[' framework (-framework ]$1[).] -)]) diff --git a/m4/find_apr.m4 b/m4/find_apr.m4 new file mode 100644 index 0000000..88f64a7 --- /dev/null +++ b/m4/find_apr.m4 @@ -0,0 +1,202 @@ +dnl -------------------------------------------------------- -*- autoconf -*- +dnl Licensed to the Apache Software Foundation (ASF) under one or more +dnl contributor license agreements. See the NOTICE file distributed with +dnl this work for additional information regarding copyright ownership. +dnl The ASF licenses this file to You under the Apache License, Version 2.0 +dnl (the "License"); you may not use this file except in compliance with +dnl the License. You may obtain a copy of the License at +dnl +dnl http://www.apache.org/licenses/LICENSE-2.0 +dnl +dnl Unless required by applicable law or agreed to in writing, software +dnl distributed under the License is distributed on an "AS IS" BASIS, +dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +dnl See the License for the specific language governing permissions and +dnl limitations under the License. + +dnl +dnl find_apr.m4 : locate the APR include files and libraries +dnl +dnl This macro file can be used by applications to find and use the APR +dnl library. It provides a standardized mechanism for using APR. It supports +dnl embedding APR into the application source, or locating an installed +dnl copy of APR. +dnl +dnl APR_FIND_APR(srcdir, builddir, implicit-install-check, acceptable-majors, +dnl detailed-check) +dnl +dnl where srcdir is the location of the bundled APR source directory, or +dnl empty if source is not bundled. +dnl +dnl where builddir is the location where the bundled APR will will be built, +dnl or empty if the build will occur in the srcdir. +dnl +dnl where implicit-install-check set to 1 indicates if there is no +dnl --with-apr option specified, we will look for installed copies. +dnl +dnl where acceptable-majors is a space separated list of acceptable major +dnl version numbers. Often only a single major version will be acceptable. +dnl If multiple versions are specified, and --with-apr=PREFIX or the +dnl implicit installed search are used, then the first (leftmost) version +dnl in the list that is found will be used. Currently defaults to [0 1]. +dnl +dnl where detailed-check is an M4 macro which sets the apr_acceptable to +dnl either "yes" or "no". The macro will be invoked for each installed +dnl copy of APR found, with the apr_config variable set appropriately. +dnl Only installed copies of APR which are considered acceptable by +dnl this macro will be considered found. If no installed copies are +dnl considered acceptable by this macro, apr_found will be set to either +dnl either "no" or "reconfig". +dnl +dnl Sets the following variables on exit: +dnl +dnl apr_found : "yes", "no", "reconfig" +dnl +dnl apr_config : If the apr-config tool exists, this refers to it. If +dnl apr_found is "reconfig", then the bundled directory +dnl should be reconfigured *before* using apr_config. +dnl +dnl Note: this macro file assumes that apr-config has been installed; it +dnl is normally considered a required part of an APR installation. +dnl +dnl If a bundled source directory is available and needs to be (re)configured, +dnl then apr_found is set to "reconfig". The caller should reconfigure the +dnl (passed-in) source directory, placing the result in the build directory, +dnl as appropriate. +dnl +dnl If apr_found is "yes" or "reconfig", then the caller should use the +dnl value of apr_config to fetch any necessary build/link information. +dnl + +AC_DEFUN([APR_FIND_APR], [ + apr_found="no" + + if test "$target_os" = "os2-emx"; then + # Scripts don't pass test -x on OS/2 + TEST_X="test -f" + else + TEST_X="test -x" + fi + + ifelse([$4], [], [ + ifdef(AC_WARNING,AC_WARNING([$0: missing argument 4 (acceptable-majors): Defaulting to APR 0.x then APR 1.x])) + acceptable_majors="0 1"], + [acceptable_majors="$4"]) + + apr_temp_acceptable_apr_config="" + for apr_temp_major in $acceptable_majors + do + case $apr_temp_major in + 0) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-config" + ;; + *) + apr_temp_acceptable_apr_config="$apr_temp_acceptable_apr_config apr-$apr_temp_major-config" + ;; + esac + done + + AC_MSG_CHECKING(for APR) + AC_ARG_WITH(apr, + [ --with-apr=PATH prefix for installed APR or the full path to + apr-config], + [ + if test "$withval" = "no" || test "$withval" = "yes"; then + AC_MSG_ERROR([--with-apr requires a directory or file to be provided]) + fi + + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + for lookdir in "$withval/bin" "$withval" + do + if $TEST_X "$lookdir/$apr_temp_apr_config_file"; then + apr_config="$lookdir/$apr_temp_apr_config_file" + ifelse([$5], [], [], [ + apr_acceptable="yes" + $5 + if test "$apr_acceptable" != "yes"; then + AC_MSG_WARN([Found APR in $apr_config, but we think it is considered unacceptable]) + continue + fi]) + apr_found="yes" + break 2 + fi + done + done + + if test "$apr_found" != "yes" && $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then + apr_config="$withval" + ifelse([$5], [], [apr_found="yes"], [ + apr_acceptable="yes" + $5 + if test "$apr_acceptable" = "yes"; then + apr_found="yes" + fi]) + fi + + dnl if --with-apr is used, it is a fatal error for its argument + dnl to be invalid + if test "$apr_found" != "yes"; then + AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a build directory, or an apr-config file.]) + fi + ],[ + dnl If we allow installed copies, check those before using bundled copy. + if test -n "$3" && test "$3" = "1"; then + for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config + do + if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then + apr_config="$apr_temp_apr_config_file" + ifelse([$5], [], [], [ + apr_acceptable="yes" + $5 + if test "$apr_acceptable" != "yes"; then + AC_MSG_WARN([skipped APR at $apr_config, version not acceptable]) + continue + fi]) + apr_found="yes" + break + else + dnl look in some standard places + for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do + if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then + apr_config="$lookdir/bin/$apr_temp_apr_config_file" + ifelse([$5], [], [], [ + apr_acceptable="yes" + $5 + if test "$apr_acceptable" != "yes"; then + AC_MSG_WARN([skipped APR at $apr_config, version not acceptable]) + continue + fi]) + apr_found="yes" + break 2 + fi + done + fi + done + fi + dnl if we have not found anything yet and have bundled source, use that + if test "$apr_found" = "no" && test -d "$1"; then + apr_temp_abs_srcdir="`cd $1 && pwd`" + apr_found="reconfig" + apr_bundled_major="`sed -n '/#define.*APR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p' \"$1/include/apr_version.h\"`" + case $apr_bundled_major in + "") + AC_MSG_ERROR([failed to find major version of bundled APR]) + ;; + 0) + apr_temp_apr_config_file="apr-config" + ;; + *) + apr_temp_apr_config_file="apr-$apr_bundled_major-config" + ;; + esac + if test -n "$2"; then + apr_config="$2/$apr_temp_apr_config_file" + else + apr_config="$1/$apr_temp_apr_config_file" + fi + fi + ]) + + AC_MSG_RESULT($apr_found) +]) diff --git a/m4/framework.m4 b/m4/framework.m4 new file mode 100644 index 0000000..1de128f --- /dev/null +++ b/m4/framework.m4 @@ -0,0 +1,50 @@ +# AC_CHECK_FRAMEWORK(FRAMEWORK, PROLOGUE, BODY, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], +# [OTHER-LIBRARIES]) +# ------------------------------------------------------ +# +# Use a cache variable name containing both the framework and function name, +# because the test really is for framework $1 defining function $2, not +# just for framework $1. Separate tests with the same $1 and different $2s +# may have different results. +# +# Note that using directly AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1]) +# is asking for troubles, since AC_CHECK_FRAMEWORK($framework, fun) would give +# ac_cv_framework_$framework_fun, which is definitely not what was meant. Hence +# the AS_LITERAL_IF indirection. +# +# FIXME: This macro is extremely suspicious. It DEFINEs unconditionally, +# whatever the FUNCTION, in addition to not being a *S macro. Note +# that the cache does depend upon the function we are looking for. +# +# It is on purpose we used `ac_check_framework_save_LIBS' and not just +# `ac_save_LIBS': there are many macros which don't want to see `LIBS' +# changed but still want to use AC_CHECK_FRAMEWORK, so they save `LIBS'. +# And ``ac_save_LIBS' is too tempting a name, so let's leave them some +# freedom. +AC_DEFUN([AC_CHECK_FRAMEWORK], [ + m4_ifval([$4], , [AH_CHECK_FRAMEWORK([$1])])dnl + AS_LITERAL_IF([$1], [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])], + [AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1''])] + )dnl + AC_CACHE_CHECK([for framework $1], ac_Framework, [ + ac_check_framework_save_LIBS=$LIBS + LIBS="-framework $1 $6 $LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([$2], [$3])],[ + AS_VAR_SET(ac_Framework, yes) + ], [AS_VAR_SET(ac_Framework, no)]) + LIBS=$ac_check_framework_save_LIBS] + ) + AS_IF([test AS_VAR_GET(ac_Framework) = yes], [ + AC_LIB_APPENDTOVAR([LIBS], ["-framework $1 $LIBS"]) + m4_default([$4], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FRAMEWORK_$1))]) + ], [$5])dnl + AS_VAR_POPDEF([ac_Framework])dnl +])# AC_CHECK_FRAMEWORK + +# AH_CHECK_FRAMEWORK(FRAMEWORK) +# --------------------- +m4_define([AH_CHECK_FRAMEWORK], [ + AH_TEMPLATE(AS_TR_CPP(HAVE_FRAMEWORK_$1), + [Define to 1 if you have the `]$1[' framework (-framework ]$1[).] +)])