X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/a93f15c0bc99a80cc7dbe2f43f53ca3f2d7f64a3..e7ff015817107dbac9373c19ce851178e4f3c791:/configure?ds=sidebyside diff --git a/configure b/configure index 5e52ff8..fc1f178 100755 --- a/configure +++ b/configure @@ -650,6 +650,7 @@ ac_ct__LIPO _LIPO SO LTFLAGS +LTLIBGCC LTLIBTERMCAP LTLIBREADLINE CY_OBJECTIVEC_FALSE @@ -669,6 +670,7 @@ LTJAVASCRIPTCORE WEBKIT_LIBS WEBKIT_CFLAGS CY_EXECUTE +CY_ARCH CY_FILTERS GNUTAR GPERF @@ -3158,10 +3160,6 @@ fi -am_cv_CC_dependencies_compiler_type=none -am_cv_CXX_dependencies_compiler_type=none -am_cv_OBJCXX_dependencies_compiler_type=none - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5910,7 +5908,7 @@ else if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" fi - rm -f conftest* + rm -rf conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } @@ -7276,7 +7274,7 @@ for ac_symprfx in "" "_"; do # Check to see that the pipe works correctly. pipe_works=no - rm -f conftest* + rm -rf conftest* cat > conftest.$ac_ext <<_LT_EOF #ifdef __cplusplus extern "C" { @@ -7792,7 +7790,7 @@ else if $GREP 'Manifest Tool' conftest.out > /dev/null; then lt_cv_path_mainfest_tool=yes fi - rm -f conftest* + rm -rf conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } @@ -9177,7 +9175,7 @@ ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +$RM -r conftest* ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext @@ -9234,7 +9232,7 @@ else lt_cv_prog_compiler_rtti_exceptions=yes fi fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 @@ -9611,7 +9609,7 @@ else lt_cv_prog_compiler_pic_works=yes fi fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 @@ -9723,14 +9721,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 @@ -9778,14 +9776,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 @@ -9800,7 +9798,7 @@ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes - $RM conftest* + $RM -r conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no @@ -11016,7 +11014,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } if ${lt_cv_archive_cmds_need_lc+:} false; then : $as_echo_n "(cached) " >&6 else - $RM conftest* + $RM -r conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -11051,7 +11049,7 @@ else else cat conftest.err 1>&5 fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 @@ -12917,7 +12915,7 @@ compiler=$CC echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +$RM -r conftest* ac_outfile=conftest.$ac_objext echo "$lt_simple_link_test_code" >conftest.$ac_ext @@ -14739,7 +14737,7 @@ else lt_cv_prog_compiler_pic_works_CXX=yes fi fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 @@ -14842,14 +14840,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 @@ -14894,14 +14892,14 @@ else fi fi chmod u+w . 2>&5 - $RM conftest* + $RM -r conftest* # SGI C++ compiler will create directory out/ii_files/ for # template instantiation test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files $RM out/* && rmdir out cd .. $RM -r conftest - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 @@ -14916,7 +14914,7 @@ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes - $RM conftest* + $RM -r conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no @@ -15003,7 +15001,7 @@ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then : $as_echo_n "(cached) " >&6 else - $RM conftest* + $RM -r conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -15038,7 +15036,7 @@ else else cat conftest.err 1>&5 fi - $RM conftest* + $RM -r conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 @@ -15931,7 +15929,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -18334,6 +18331,90 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +for cy_arch in ppc ppc64 i386 x86_64 armv6 arm64; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -arch $cy_arch" >&5 +$as_echo_n "checking for -arch $cy_arch... " >&6; } + + cy_save=$CXXFLAGS + + for element in "-arch $cy_arch"; 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. */ + +int +main () +{ + + ; + return 0; +} +_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 "-arch $cy_arch"; do + haveit= + for x in $CY_ARCH; 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 + CY_ARCH="${CY_ARCH}${CY_ARCH:+ }$element" + fi + done + + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + +done + + @@ -18435,7 +18516,6 @@ if test -n "$WEBKIT_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18452,7 +18532,6 @@ if test -n "$WEBKIT_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18472,9 +18551,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WEBKIT_PKG_ERRORS" >&5 @@ -18644,7 +18723,6 @@ if test -n "$WEBKIT_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18661,7 +18739,6 @@ if test -n "$WEBKIT_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18681,9 +18758,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WEBKIT_PKG_ERRORS" >&5 @@ -18853,7 +18930,6 @@ if test -n "$WEBKIT_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18870,7 +18946,6 @@ if test -n "$WEBKIT_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "$cy_webkit_pkg" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -18890,9 +18965,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$cy_webkit_pkg" 2>&1` else - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$cy_webkit_pkg" 2>&1` + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$cy_webkit_pkg" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$WEBKIT_PKG_ERRORS" >&5 @@ -19211,7 +19286,6 @@ if test -n "$LIBFFI_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19228,7 +19302,6 @@ if test -n "$LIBFFI_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19248,9 +19321,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` else - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBFFI_PKG_ERRORS" >&5 @@ -19391,7 +19464,6 @@ if test -n "$LIBFFI_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_CFLAGS=`$PKG_CONFIG --cflags "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19408,7 +19480,6 @@ if test -n "$LIBFFI_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBFFI_LIBS=`$PKG_CONFIG --libs "libffi" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -19428,9 +19499,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi" 2>&1` else - LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libffi" 2>&1` + LIBFFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBFFI_PKG_ERRORS" >&5 @@ -20004,6 +20075,8 @@ fi + + SO=$acl_shlibext