From: Douglas William Thrift Date: Thu, 4 Feb 2010 05:25:15 +0000 (+0000) Subject: Some directories of dooom. X-Git-Tag: v0.9.432~115 X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/3530897b0e384dd614bfef0a446b343e00a6616b Some directories of dooom. --- diff --git a/GNUmakefile.in b/GNUmakefile.in index bc8da82..f1ecba5 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,3 +1,5 @@ +# @configure_input@ + SHELL := @_BASH@ VPATH := @srcdir@ @@ -16,11 +18,39 @@ objcxx := @OBJCXX@ cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 ldflags := @LDFLAGS@ library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@ +time := $(shell which @TIME@) + +INSTALL := @INSTALL@ +INSTALL_PROGRAM := @INSTALL_PROGRAM@ +INSTALL_DATA := @INSTALL_DATA@ + +PACKAGE_TARNAME := @PACKAGE_TARNAME@ +prefix := @prefix@ +exec_prefix := @exec_prefix@ +bindir := @bindir@ +sbindir := @sbindir@ +libexecdir := @libexecdir@ +datarootdir := @datarootdir@ +datadir := @datadir@ +sysconfdir := @sysconfdir@ +sharedstatedir := @sharedstatedir@ +localstatedir := @localstatedir@ +includedir := @includedir@ +oldincludedir := @oldincludedir@ +docdir := @docdir@ +infodir := @infodir@ +htmldir := @htmldir@ +dvidir := @dvidir@ +pdfdir := @pdfdir@ +psdir := @psdir@ +libdir := @libdir@ +localedir := @localedir@ +mandir := @mandir@ paths := $(foreach path,$(paths),$(wildcard $(path))) cflags += $(foreach path,$(paths),-I$(path) -L$(path)) -svn := $(shell svnversion) +svn := $(shell svnversion $(srcdir)) all: all := cycript @@ -144,11 +174,11 @@ lex.cy.lo: lex.cy.c $(header) $(libtool) --mode=compile $(objcxx) $(cflags) -c -o $@ $< $(lib)cycript.la: $(code) - $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath /usr/lib + $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath $(libdir) $(ldid) $@ cycript: Console.lo $(lib)cycript.la $(inject) - $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(lib)cycript.la $(link) -rpath /usr/lib + $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(lib)cycript.la $(link) -rpath $(libdir) $(entitle) cycript package: $(deb) @@ -156,7 +186,7 @@ package: $(deb) test: $(deb) dpkg -i $(deb) if [[ -e target.cy ]]; then cycript -c target.cy && echo; fi - if [[ -e jquery.js ]]; then /usr/bin/time cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{cyc,gcc,bak,mam,yui}.js.gz; fi + if [[ -e jquery.js ]]; then $(time) cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{cyc,gcc,bak,mam,yui}.js.gz; fi if [[ -e test.cy ]]; then cycript test.cy; fi install: cycript $(lib)cycript.$(dll) diff --git a/configure b/configure index b204cda..2e1190a 100755 --- a/configure +++ b/configure @@ -824,6 +824,7 @@ ac_ct_CXX CXXFLAGS CXX LTLIBAPR +TIME GPERF _BASH FLEX @@ -4042,13 +4043,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4045: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4046: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4048: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4049: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4051: output\"" >&5) + (eval echo "\"\$as_me:4052: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5254,7 +5255,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5257 "configure"' > conftest.$ac_ext + echo '#line 5258 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6779,11 +6780,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6782: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6783: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6786: \$? = $ac_status" >&5 + echo "$as_me:6787: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7118,11 +7119,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7121: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7122: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7125: \$? = $ac_status" >&5 + echo "$as_me:7126: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7223,11 +7224,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7226: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7227: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7230: \$? = $ac_status" >&5 + echo "$as_me:7231: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7278,11 +7279,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7281: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7282: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7285: \$? = $ac_status" >&5 + echo "$as_me:7286: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9662,7 +9663,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9665 "configure" +#line 9666 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9758,7 +9759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 9761 "configure" +#line 9762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10456,6 +10457,48 @@ fi test -n "$GPERF" && break done +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 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_TIME+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$TIME"; then + ac_cv_prog_TIME="$TIME" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_TIME="$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 +TIME=$ac_cv_prog_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 + + + test -n "$TIME" && break +done + apr_found="no" @@ -13129,11 +13172,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13132: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13175: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13136: \$? = $ac_status" >&5 + echo "$as_me:13179: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13228,11 +13271,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13231: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13274: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13235: \$? = $ac_status" >&5 + echo "$as_me:13278: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13280,11 +13323,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13283: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13326: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13287: \$? = $ac_status" >&5 + echo "$as_me:13330: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff --git a/configure.ac b/configure.ac index a5230c6..bc1e352 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,7 @@ AS_VERSION_COMPARE([$FLEX_VERSION], [2.5.35], [ AC_SUBST([FLEX]) AC_CHECK_PROGS([_BASH], [bash]) AC_CHECK_PROGS([GPERF], [gperf]) +AC_CHECK_PROGS([TIME], [time]) APR_FIND_APR([], [], [1], [1]) AS_CASE([$apr_found], [yes], [ AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])