From ae437e7c97695787b075a3b7000b9de48c72a38b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 20 Jun 2008 22:19:16 +0000 Subject: Imported Upstream version 0.4.1 --- (limited to 'configure') diff --git a/configure b/configure index ba81157..c3c7dc1 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for hulahop 0.4.0. +# Generated by GNU Autoconf 2.61 for hulahop 0.4.1. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='hulahop' PACKAGE_TARNAME='hulahop' -PACKAGE_VERSION='0.4.0' -PACKAGE_STRING='hulahop 0.4.0' +PACKAGE_VERSION='0.4.1' +PACKAGE_STRING='hulahop 0.4.1' PACKAGE_BUGREPORT='' ac_unique_file="configure.ac" @@ -889,6 +889,7 @@ PYGTK_DEFSDIR LIBXUL_CFLAGS LIBXUL_LIBS LIBXUL_DIR +LIBXUL_SDK_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1416,7 +1417,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hulahop 0.4.0 to adapt to many kinds of systems. +\`configure' configures hulahop 0.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1486,7 +1487,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hulahop 0.4.0:";; + short | recursive ) echo "Configuration of hulahop 0.4.1:";; esac cat <<\_ACEOF @@ -1596,7 +1597,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hulahop configure 0.4.0 +hulahop configure 0.4.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1610,7 +1611,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hulahop $as_me 0.4.0, which was +It was created by hulahop $as_me 0.4.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2306,7 +2307,7 @@ fi # Define the identity of the package. PACKAGE='hulahop' - VERSION='0.4.0' + VERSION='0.4.1' cat >>confdefs.h <<_ACEOF @@ -4350,7 +4351,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4353 "configure"' > conftest.$ac_ext + echo '#line 4354 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7088,11 +7089,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:7091: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7092: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7095: \$? = $ac_status" >&5 + echo "$as_me:7096: \$? = $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. @@ -7378,11 +7379,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:7381: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7382: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7385: \$? = $ac_status" >&5 + echo "$as_me:7386: \$? = $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. @@ -7482,11 +7483,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:7485: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7486: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7489: \$? = $ac_status" >&5 + echo "$as_me:7490: \$? = $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 @@ -9833,7 +9834,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12357: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12360: \$? = $ac_status" >&5 + echo "$as_me:12361: \$? = $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. @@ -12457,11 +12458,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:12460: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12461: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12464: \$? = $ac_status" >&5 + echo "$as_me:12465: \$? = $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 @@ -14021,11 +14022,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:14024: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14025: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14028: \$? = $ac_status" >&5 + echo "$as_me:14029: \$? = $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. @@ -14125,11 +14126,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:14128: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14129: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14132: \$? = $ac_status" >&5 + echo "$as_me:14133: \$? = $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 @@ -16314,11 +16315,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:16317: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16318: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16321: \$? = $ac_status" >&5 + echo "$as_me:16322: \$? = $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. @@ -16604,11 +16605,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:16607: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16608: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16611: \$? = $ac_status" >&5 + echo "$as_me:16612: \$? = $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. @@ -16708,11 +16709,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:16711: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16712: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16715: \$? = $ac_status" >&5 + echo "$as_me:16716: \$? = $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 @@ -19488,11 +19489,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for DEPS" >&5 echo $ECHO_N "checking for DEPS... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$DEPS_CFLAGS"; then - pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DEPS_CFLAGS"; then + pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 ac_status=$? @@ -19502,15 +19502,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$DEPS_LIBS"; then - pkg_cv_DEPS_LIBS="$DEPS_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$DEPS_LIBS"; then + pkg_cv_DEPS_LIBS="$DEPS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5 ac_status=$? @@ -19520,9 +19518,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -19535,9 +19532,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"` + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1` else - DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"` + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEPS_PKG_ERRORS" >&5 @@ -19830,11 +19827,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for PYGTK" >&5 echo $ECHO_N "checking for PYGTK... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$PYGTK_CFLAGS"; then - pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$PYGTK_CFLAGS"; then + pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "pygtk-2.0") 2>&5 ac_status=$? @@ -19844,15 +19840,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$PYGTK_LIBS"; then - pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$PYGTK_LIBS"; then + pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0\"") >&5 ($PKG_CONFIG --exists --print-errors "pygtk-2.0") 2>&5 ac_status=$? @@ -19862,9 +19856,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -19877,9 +19870,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pygtk-2.0"` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0" 2>&1` else - PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pygtk-2.0"` + PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$PYGTK_PKG_ERRORS" >&5 @@ -19945,11 +19938,10 @@ pkg_failed=no { echo "$as_me:$LINENO: checking for LIBXUL" >&5 echo $ECHO_N "checking for LIBXUL... $ECHO_C" >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$LIBXUL_CFLAGS"; then - pkg_cv_LIBXUL_CFLAGS="$LIBXUL_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$LIBXUL_CFLAGS"; then + pkg_cv_LIBXUL_CFLAGS="$LIBXUL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5 ($PKG_CONFIG --exists --print-errors "libxul") 2>&5 ac_status=$? @@ -19959,15 +19951,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBXUL_LIBS"; then - pkg_cv_LIBXUL_LIBS="$LIBXUL_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$LIBXUL_LIBS"; then + pkg_cv_LIBXUL_LIBS="$LIBXUL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul\"") >&5 ($PKG_CONFIG --exists --print-errors "libxul") 2>&5 ac_status=$? @@ -19977,9 +19967,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -19992,9 +19981,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBXUL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul"` + LIBXUL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxul" 2>&1` else - LIBXUL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul"` + LIBXUL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxul" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBXUL_PKG_ERRORS" >&5 @@ -20055,7 +20044,7 @@ fi # FIXME To be able to use pyxpcom we currently need # to link to xpcom at build time. Which involves various hacks. LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul` -LIBXUL_DIR=`echo $LIBXUL_SDK_DIR | sed -e 's/-devel//'` +LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`$PKG_CONFIG --modversion libxul`" LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom" LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul` @@ -20064,7 +20053,8 @@ LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxu -ac_config_files="$ac_config_files Makefile data/Makefile src/Makefile python/Makefile python/config.py" + +ac_config_files="$ac_config_files Makefile components/Makefile data/Makefile data/chrome/Makefile src/Makefile python/Makefile python/config.py" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20513,7 +20503,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hulahop $as_me 0.4.0, which was +This file was extended by hulahop $as_me 0.4.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20560,7 +20550,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -hulahop config.status 0.4.0 +hulahop config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -20667,7 +20657,9 @@ do case $ac_config_target in "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "components/Makefile") CONFIG_FILES="$CONFIG_FILES components/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; + "data/chrome/Makefile") CONFIG_FILES="$CONFIG_FILES data/chrome/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; "python/config.py") CONFIG_FILES="$CONFIG_FILES python/config.py" ;; @@ -20895,11 +20887,12 @@ PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim LIBXUL_CFLAGS!$LIBXUL_CFLAGS$ac_delim LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim LIBXUL_DIR!$LIBXUL_DIR$ac_delim +LIBXUL_SDK_DIR!$LIBXUL_SDK_DIR$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -21221,7 +21214,7 @@ echo "$as_me: executing $ac_file commands" >&6;} # 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 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then + 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\(//\)[^/]' \| \ -- cgit v0.9.1