r18711 - gnucash/trunk - Bug #610348: Add compiling our own binary of libbonoboui because the ftp.gnome.org binary still depends on the obsolete libxml2.dll.
Geert Janssens
janssens-geert at telenet.be
Thu Feb 25 05:22:54 EST 2010
On Tuesday 23 February 2010, Christian Stimming wrote:
> Author: cstim
> Date: 2010-02-23 15:10:31 -0500 (Tue, 23 Feb 2010)
> New Revision: 18711
> Trac: http://svn.gnucash.org/trac/changeset/18711
>
...
> Added: gnucash/trunk/packaging/win32/libbonoboui-2.24.2.patch
> ===================================================================
> --- gnucash/trunk/packaging/win32/libbonoboui-2.24.2.patch
> (rev 0) +++
> gnucash/trunk/packaging/win32/libbonoboui-2.24.2.patch 2010-02-23 20:10:31
> UTC (rev 18711) @@ -0,0 +1,223 @@
> +diff -ur libbonoboui-2.24.2/configure libbonoboui-2.24.2-cs/configure
> +--- libbonoboui-2.24.2/configure 2009-09-22 23:12:20 +0000
> ++++ libbonoboui-2.24.2-cs/configure 2010-02-23 12:25:27 +0000
> +@@ -16422,219 +16422,6 @@
> +
> +
> + # popt
> +-{ $as_echo "$as_me:$LINENO: checking for poptStrippedArgv in -lpopt" >&5
> +-$as_echo_n "checking for poptStrippedArgv in -lpopt... " >&6; }
> +-if test "${ac_cv_lib_popt_poptStrippedArgv+set}" = set; then
> +- $as_echo_n "(cached) " >&6
> +-else
> +- ac_check_lib_save_LIBS=$LIBS
> +-LIBS="-lpopt $LIBS"
> +-cat >conftest.$ac_ext <<_ACEOF
> +-/* confdefs.h. */
> +-_ACEOF
> +-cat confdefs.h >>conftest.$ac_ext
> +-cat >>conftest.$ac_ext <<_ACEOF
> +-/* end confdefs.h. */
> +-
> +-/* Override any GCC internal prototype to avoid an error.
> +- Use char because int might match the return type of a GCC
> +- builtin and then its argument prototype would still apply. */
> +-#ifdef __cplusplus
> +-extern "C"
> +-#endif
> +-char poptStrippedArgv ();
> +-int
> +-main ()
> +-{
> +-return poptStrippedArgv ();
> +- ;
> +- return 0;
> +-}
> +-_ACEOF
> +-rm -f conftest.$ac_objext conftest$ac_exeext
> +-if { (ac_try="$ac_link"
> +-case "(($ac_try" in
> +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +- *) ac_try_echo=$ac_try;;
> +-esac
> +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> +-$as_echo "$ac_try_echo") >&5
> +- (eval "$ac_link") 2>conftest.er1
> +- ac_status=$?
> +- grep -v '^ *+' conftest.er1 >conftest.err
> +- rm -f conftest.er1
> +- cat conftest.err >&5
> +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +- (exit $ac_status); } && {
> +- test -z "$ac_c_werror_flag" ||
> +- test ! -s conftest.err
> +- } && test -s conftest$ac_exeext && {
> +- test "$cross_compiling" = yes ||
> +- $as_test_x conftest$ac_exeext
> +- }; then
> +- ac_cv_lib_popt_poptStrippedArgv=yes
> +-else
> +- $as_echo "$as_me: failed program was:" >&5
> +-sed 's/^/| /' conftest.$ac_ext >&5
> +-
> +- ac_cv_lib_popt_poptStrippedArgv=no
> +-fi
> +-
> +-rm -rf conftest.dSYM
> +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> +- conftest$ac_exeext conftest.$ac_ext
> +-LIBS=$ac_check_lib_save_LIBS
> +-fi
> +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptStrippedArgv" >&5
> +-$as_echo "$ac_cv_lib_popt_poptStrippedArgv" >&6; }
> +-if test "x$ac_cv_lib_popt_poptStrippedArgv" = x""yes; then
> +- POPT_LIBS=-lpopt
> +-else
> +- { { $as_echo "$as_me:$LINENO: error: You must have popt version 1.5 or
> greater installed." >&5 +-$as_echo "$as_me: error: You must have popt
> version 1.5 or greater installed." >&2;} +- { (exit 1); exit 1; }; }
> +-fi
> +-
> +-
> +-if test "${ac_cv_header_popt_h+set}" = set; then
> +- { $as_echo "$as_me:$LINENO: checking for popt.h" >&5
> +-$as_echo_n "checking for popt.h... " >&6; }
> +-if test "${ac_cv_header_popt_h+set}" = set; then
> +- $as_echo_n "(cached) " >&6
> +-fi
> +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5
> +-$as_echo "$ac_cv_header_popt_h" >&6; }
> +-else
> +- # Is the header compilable?
> +-{ $as_echo "$as_me:$LINENO: checking popt.h usability" >&5
> +-$as_echo_n "checking popt.h usability... " >&6; }
> +-cat >conftest.$ac_ext <<_ACEOF
> +-/* confdefs.h. */
> +-_ACEOF
> +-cat confdefs.h >>conftest.$ac_ext
> +-cat >>conftest.$ac_ext <<_ACEOF
> +-/* end confdefs.h. */
> +-$ac_includes_default
> +-#include <popt.h>
> +-_ACEOF
> +-rm -f conftest.$ac_objext
> +-if { (ac_try="$ac_compile"
> +-case "(($ac_try" in
> +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +- *) ac_try_echo=$ac_try;;
> +-esac
> +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> +-$as_echo "$ac_try_echo") >&5
> +- (eval "$ac_compile") 2>conftest.er1
> +- ac_status=$?
> +- grep -v '^ *+' conftest.er1 >conftest.err
> +- rm -f conftest.er1
> +- cat conftest.err >&5
> +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +- (exit $ac_status); } && {
> +- test -z "$ac_c_werror_flag" ||
> +- test ! -s conftest.err
> +- } && test -s conftest.$ac_objext; then
> +- ac_header_compiler=yes
> +-else
> +- $as_echo "$as_me: failed program was:" >&5
> +-sed 's/^/| /' conftest.$ac_ext >&5
> +-
> +- ac_header_compiler=no
> +-fi
> +-
> +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
> +-$as_echo "$ac_header_compiler" >&6; }
> +-
> +-# Is the header present?
> +-{ $as_echo "$as_me:$LINENO: checking popt.h presence" >&5
> +-$as_echo_n "checking popt.h presence... " >&6; }
> +-cat >conftest.$ac_ext <<_ACEOF
> +-/* confdefs.h. */
> +-_ACEOF
> +-cat confdefs.h >>conftest.$ac_ext
> +-cat >>conftest.$ac_ext <<_ACEOF
> +-/* end confdefs.h. */
> +-#include <popt.h>
> +-_ACEOF
> +-if { (ac_try="$ac_cpp conftest.$ac_ext"
> +-case "(($ac_try" in
> +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> +- *) ac_try_echo=$ac_try;;
> +-esac
> +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
> +-$as_echo "$ac_try_echo") >&5
> +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
> +- ac_status=$?
> +- grep -v '^ *+' conftest.er1 >conftest.err
> +- rm -f conftest.er1
> +- cat conftest.err >&5
> +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
> +- (exit $ac_status); } >/dev/null && {
> +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
> +- test ! -s conftest.err
> +- }; then
> +- ac_header_preproc=yes
> +-else
> +- $as_echo "$as_me: failed program was:" >&5
> +-sed 's/^/| /' conftest.$ac_ext >&5
> +-
> +- ac_header_preproc=no
> +-fi
> +-
> +-rm -f conftest.err conftest.$ac_ext
> +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
> +-$as_echo "$ac_header_preproc" >&6; }
> +-
> +-# So? What about this header?
> +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
> +- yes:no: )
> +- { $as_echo "$as_me:$LINENO: WARNING: popt.h: accepted by the
> compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING:
> popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +-
> { $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the
> compiler's result" >&5 +-$as_echo "$as_me: WARNING: popt.h: proceeding
> with the compiler's result" >&2;} +- ac_header_preproc=yes
> +- ;;
> +- no:yes:* )
> +- { $as_echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be
> compiled" >&5 +-$as_echo "$as_me: WARNING: popt.h: present but cannot be
> compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: popt.h:
> check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING:
> popt.h: check for missing prerequisite headers?" >&2;} +- {
> $as_echo "$as_me:$LINENO: WARNING: popt.h: see the Autoconf documentation"
> >&5 +-$as_echo "$as_me: WARNING: popt.h: see the Autoconf documentation"
> >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: popt.h: section
> \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING:
> popt.h: section \"Present But Cannot Be Compiled\"" >&2;} +- {
> $as_echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the
> preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: popt.h: proceeding
> with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO:
> WARNING: popt.h: in the future, the compiler will take precedence" >&5
> +-$as_echo "$as_me: WARNING: popt.h: in the future, the compiler will take
> precedence" >&2;} +- ( cat <<\_ASBOX
> +-##
> --------------------------------------------------------------------------
> ----------------- ## +-## Report this to
> http://bugzilla.gnome.org/enter_bug.cgi?product=bonobo&component=libbonobo
> ui ## +-##
> --------------------------------------------------------------------------
> ----------------- ## +-_ASBOX
> +- ) | sed "s/^/$as_me: WARNING: /" >&2
> +- ;;
> +-esac
> +-{ $as_echo "$as_me:$LINENO: checking for popt.h" >&5
> +-$as_echo_n "checking for popt.h... " >&6; }
> +-if test "${ac_cv_header_popt_h+set}" = set; then
> +- $as_echo_n "(cached) " >&6
> +-else
> +- ac_cv_header_popt_h=$ac_header_preproc
> +-fi
> +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_popt_h" >&5
> +-$as_echo "$ac_cv_header_popt_h" >&6; }
> +-
> +-fi
> +-if test "x$ac_cv_header_popt_h" = x""yes; then
> +- :
> +-else
> +- { { $as_echo "$as_me:$LINENO: error: Failed to find popt.h - you may
> have to adjust your environment" >&5 +-$as_echo "$as_me: error: Failed to
> find popt.h - you may have to adjust your environment" >&2;} +- { (exit
> 1); exit 1; }; }
> +-fi
> +
> +
> +
>
> _______________________________________________
> gnucash-changes mailing list
> gnucash-changes at gnucash.org
> https://lists.gnucash.org/mailman/listinfo/gnucash-changes
>
Christian,
With your fix for libbonoboui on Windows, I see you patch its config.ac file
to remove all the popt tests.
On the other hand, the install scripts still download and install popt. Is
that still required ?
I ask because I am about to remove the popt check from GnuCash' configure.in
(GnuCash no longer uses popt).
Geert
More information about the gnucash-devel
mailing list