r22380 - gnucash/trunk/packaging/win32 - Win32 build: remove libgnome related parts from the build scripts
Geert Janssens
gjanssens at code.gnucash.org
Mon Sep 10 15:22:12 EDT 2012
Author: gjanssens
Date: 2012-09-10 15:22:12 -0400 (Mon, 10 Sep 2012)
New Revision: 22380
Trac: http://svn.gnucash.org/trac/changeset/22380
Removed:
gnucash/trunk/packaging/win32/libbonoboui-2.24.2.patch
Modified:
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/dist-impl.sh
gnucash/trunk/packaging/win32/dist.sh
gnucash/trunk/packaging/win32/install-impl.sh
gnucash/trunk/packaging/win32/install.sh
Log:
Win32 build: remove libgnome related parts from the build scripts
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2012-09-10 19:22:00 UTC (rev 22379)
+++ gnucash/trunk/packaging/win32/defaults.sh 2012-09-10 19:22:12 UTC (rev 22380)
@@ -247,8 +247,6 @@
set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip"
set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.28/glib_2.28.8-1_win32.zip"
set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.28/glib-dev_2.28.8-1_win32.zip"
-set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"
-set_default GNOME_VFS_DEV_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs-dev_2.24.1-1_win32.zip"
GTK_VERSION="2.24.10"
set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+_${GTK_VERSION}-1_win32.zip"
set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.24/gtk+-dev_${GTK_VERSION}-1_win32.zip"
@@ -258,14 +256,8 @@
set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl_2.3.21-1_win32.zip"
set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgpl-dev_2.3.21-1_win32.zip"
-set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
-set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
-set_default LIBGNOME_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome_2.24.1-1_win32.zip"
-set_default LIBGNOME_DEV_URL "$GNOME_WIN32_URL/libgnome/2.24/libgnome-dev_2.24.1-1_win32.zip"
set_default LIBGNOMECANVAS_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
set_default LIBGNOMECANVAS_DEV_URL "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
-set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.zip"
-set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip"
set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
@@ -281,8 +273,6 @@
set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.29/pango-dev_1.29.4-1_win32.zip"
set_default PKG_CONFIG_URL "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
set_default PKG_CONFIG_DEV_URL "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
-set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
-set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
set_default ZLIB_URL "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zip"
set_default ZLIB_DEV_URL "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
set_default GNOME_DIR $GLOBAL_DIR\\gnome
@@ -290,12 +280,6 @@
PIXMAN_VERSION="0.22.0"
set_default PIXMAN_URL "http://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
-set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
-set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"
-set_default LIBBONOBOUI_SRC_URL "$GNOME_MIRROR/sources/libbonoboui/2.24/libbonoboui-2.24.2.tar.bz2"
-set_default LIBBONOBOUI_PATCH `pwd`/libbonoboui-2.24.2.patch
-set_default LIBBONOBOUI_DIR $GLOBAL_DIR\\libbonoboui
-
set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
set_default SWIG_DIR $GLOBAL_DIR\\swig
Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh 2012-09-10 19:22:00 UTC (rev 22379)
+++ gnucash/trunk/packaging/win32/dist-impl.sh 2012-09-10 19:22:12 UTC (rev 22380)
@@ -25,7 +25,6 @@
_EXETYPE_UDIR=`unix_path $EXETYPE_DIR`
_GNOME_UDIR=`unix_path $GNOME_DIR`
_PCRE_UDIR=`unix_path $PCRE_DIR`
- _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
_LIBSOUP_UDIR=`unix_path $LIBSOUP_DIR`
_ENCHANT_UDIR=`unix_path $ENCHANT_DIR`
_LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
@@ -92,14 +91,9 @@
wget_unpacked $GDK_PIXBUF_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $DIST_DIR
smart_wget $LIBICONV_URL $DOWNLOAD_DIR
unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
@@ -108,7 +102,6 @@
#wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ORBIT2_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $PANGO_URL $DOWNLOAD_DIR $DIST_DIR
- wget_unpacked $POPT_URL $DOWNLOAD_DIR $DIST_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $DIST_DIR
echo 'gtk-theme-name = "Nimbus"' > $DIST_DIR/etc/gtk-2.0/gtkrc
@@ -181,12 +174,6 @@
cp -a ${_GWENHYWFAR_UDIR}/share/ktoblzcheck ${DIST_UDIR}/share
}
-function dist_libbonoboui() {
- setup libbonoboui
- mkdir -p $DIST_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $DIST_UDIR/bin
-}
-
function dist_libdbi() {
setup LibDBI
cp -a ${_SQLITE3_UDIR}/bin/* ${DIST_UDIR}/bin
Modified: gnucash/trunk/packaging/win32/dist.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist.sh 2012-09-10 19:22:00 UTC (rev 22379)
+++ gnucash/trunk/packaging/win32/dist.sh 2012-09-10 19:22:12 UTC (rev 22380)
@@ -31,7 +31,6 @@
add_step dist_gnome
add_step dist_isocodes
add_step dist_pcre
-add_step dist_libbonoboui
add_step dist_libgsf
add_step dist_goffice
add_step dist_libofx
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2012-09-10 19:22:00 UTC (rev 22379)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2012-09-10 19:22:12 UTC (rev 22380)
@@ -535,23 +535,13 @@
wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $GNOME_VFS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $GTK_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $INTLTOOL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBBONOBOUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBGNOMECANVAS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $LIBGNOMEUI_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
@@ -567,8 +557,6 @@
wget_unpacked $PANGO_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $PKG_CONFIG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_URL $DOWNLOAD_DIR $GNOME_DIR
- wget_unpacked $POPT_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_URL $DOWNLOAD_DIR $GNOME_DIR
wget_unpacked $ZLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
echo 'gtk-theme-name = "Nimbus"' > ${_GNOME_UDIR}/etc/gtk-2.0/gtkrc
@@ -895,43 +883,6 @@
fi
}
-function inst_libbonoboui() {
- setup libbonoboui
- _LIBBONOBOUI_UDIR=`unix_path $LIBBONOBOUI_DIR`
- add_to_env $_LIBBONOBOUI_UDIR/bin PATH
- add_to_env $_LIBBONOBOUI_UDIR/lib/pkgconfig PKG_CONFIG_PATH
- if quiet ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ]
- then
- echo "libbonoboui already installed in $_LIBBONOBOUI_UDIR. skipping."
- else
- wget_unpacked $LIBBONOBOUI_SRC_URL $DOWNLOAD_DIR $TMP_DIR
- mydir=`pwd`
- assert_one_dir $TMP_UDIR/libbonoboui-*
- qpushd $TMP_UDIR/libbonoboui-*
- [ -n "$LIBBONOBOUI_PATCH" -a -f "$LIBBONOBOUI_PATCH" ] && \
- patch -p1 < $LIBBONOBOUI_PATCH
- #libtoolize --force
- #aclocal ${ACLOCAL_FLAGS} -I .
- #automake
- #autoconf
- ./configure ${HOST_XCOMPILE} --prefix=$_LIBBONOBOUI_UDIR \
- POPT_LIBS="-lpopt" \
- CPPFLAGS="${GNOME_CPPFLAGS}" \
- LDFLAGS="${GNOME_LDFLAGS}" \
- --enable-static=no
- make
- make install
-
- # We override the $GNOME_DIR libbonoboui files because
- # those erroneously depend on the obsolete libxml2.dll
- cp -a $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll $_GNOME_UDIR/bin
- cp -a $_LIBBONOBOUI_UDIR/lib/libbonoboui* $_GNOME_UDIR/lib
- qpopd
- ${PKG_CONFIG} --exists --atleast-version=2.24.2 libbonoboui-2.0 && [ -f $_LIBBONOBOUI_UDIR/bin/libbonoboui*.dll ] || die "libbonoboui not installed correctly"
- rm -rf ${TMP_UDIR}/libbonoboui-*
- fi
-}
-
function inst_libdbi() {
setup LibDBI
_SQLITE3_UDIR=`unix_path ${SQLITE3_DIR}`
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2012-09-10 19:22:00 UTC (rev 22379)
+++ gnucash/trunk/packaging/win32/install.sh 2012-09-10 19:22:12 UTC (rev 22380)
@@ -90,7 +90,6 @@
add_step inst_isocodes
add_step inst_swig
add_step inst_pcre
-add_step inst_libbonoboui
add_step inst_libgsf
if [ "$CROSS_COMPILE" != "yes" ]; then
add_step inst_hh
Deleted: gnucash/trunk/packaging/win32/libbonoboui-2.24.2.patch
===================================================================
--- gnucash/trunk/packaging/win32/libbonoboui-2.24.2.patch 2012-09-10 19:22:00 UTC (rev 22379)
+++ gnucash/trunk/packaging/win32/libbonoboui-2.24.2.patch 2012-09-10 19:22:12 UTC (rev 22380)
@@ -1,453 +0,0 @@
-diff -ur libbonoboui-2.24.2/configure ../libbonoboui-2.24.2/configure
---- libbonoboui-2.24.2/configure 2009-09-22 18:12:20.000000000 -0500
-+++ ../libbonoboui-2.24.2/configure 2012-04-19 16:43:20.000000000 -0500
-@@ -798,8 +798,6 @@
- GLIB_MKENUMS
- GLIB_GENMARSHAL
- BONOBOUI_SINGLE_INCLUDES
--BONOBOUI_GLADE_LIBS
--BONOBOUI_GLADE_CFLAGS
- BONOBOUI_LIBS
- BONOBOUI_CFLAGS
- POPT_LIBS
-@@ -998,9 +996,7 @@
- XMKMF
- PKG_CONFIG
- BONOBOUI_CFLAGS
--BONOBOUI_LIBS
--BONOBOUI_GLADE_CFLAGS
--BONOBOUI_GLADE_LIBS'
-+BONOBOUI_LIBS'
-
-
- # Initialize some variables set by options.
-@@ -1680,10 +1676,6 @@
- C compiler flags for BONOBOUI, overriding pkg-config
- BONOBOUI_LIBS
- linker flags for BONOBOUI, overriding pkg-config
-- BONOBOUI_GLADE_CFLAGS
-- C compiler flags for BONOBOUI_GLADE, overriding pkg-config
-- BONOBOUI_GLADE_LIBS
-- linker flags for BONOBOUI_GLADE, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -16422,219 +16414,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=libbonoboui ##
--## ------------------------------------------------------------------------------------------- ##
--_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
-
-
-
-@@ -16891,115 +16670,6 @@
- fi;
-
-
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for BONOBOUI_GLADE" >&5
--$as_echo_n "checking for BONOBOUI_GLADE... " >&6; }
--
--if test -n "$BONOBOUI_GLADE_CFLAGS"; then
-- pkg_cv_BONOBOUI_GLADE_CFLAGS="$BONOBOUI_GLADE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BONOBOUI_MODULES libglade-2.0 >= 1.99.11\"") >&5
-- ($PKG_CONFIG --exists --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_BONOBOUI_GLADE_CFLAGS=`$PKG_CONFIG --cflags "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$BONOBOUI_GLADE_LIBS"; then
-- pkg_cv_BONOBOUI_GLADE_LIBS="$BONOBOUI_GLADE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BONOBOUI_MODULES libglade-2.0 >= 1.99.11\"") >&5
-- ($PKG_CONFIG --exists --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_BONOBOUI_GLADE_LIBS=`$PKG_CONFIG --libs "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- BONOBOUI_GLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>&1`
-- else
-- BONOBOUI_GLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$BONOBOUI_MODULES libglade-2.0 >= 1.99.11" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$BONOBOUI_GLADE_PKG_ERRORS" >&5
--
-- { { $as_echo "$as_me:$LINENO: error: Package requirements ($BONOBOUI_MODULES libglade-2.0 >= 1.99.11) were not met:
--
--$BONOBOUI_GLADE_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements ($BONOBOUI_MODULES libglade-2.0 >= 1.99.11) were not met:
--
--$BONOBOUI_GLADE_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
-- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables BONOBOUI_GLADE_CFLAGS
--and BONOBOUI_GLADE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
--else
-- BONOBOUI_GLADE_CFLAGS=$pkg_cv_BONOBOUI_GLADE_CFLAGS
-- BONOBOUI_GLADE_LIBS=$pkg_cv_BONOBOUI_GLADE_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
--fi
--
-
-
- if test "$enable_maintainer_mode" = "yes"; then
-@@ -17194,7 +16864,7 @@
-
-
-
--ac_config_files="$ac_config_files Makefile libbonoboui-zip po/Makefile.in bonobo/Makefile bonobo/libbonoboui-2.0.pc bonobo/libbonoboui-2.0-uninstalled.pc glade/Makefile samples/Makefile samples/controls/Makefile samples/bonoboui/Makefile samples/container/Makefile samples/compound-doc/Makefile samples/compound-doc/container/Makefile samples/canvdemo/Makefile tests/Makefile tests/control/Makefile tools/Makefile tools/browser/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile"
-+ac_config_files="$ac_config_files Makefile libbonoboui-zip po/Makefile.in bonobo/Makefile bonobo/libbonoboui-2.0.pc bonobo/libbonoboui-2.0-uninstalled.pc samples/Makefile samples/controls/Makefile samples/bonoboui/Makefile samples/container/Makefile samples/compound-doc/Makefile samples/compound-doc/container/Makefile samples/canvdemo/Makefile tests/Makefile tests/control/Makefile tools/Makefile tools/browser/Makefile doc/Makefile doc/api/Makefile doc/api/figures/Makefile"
-
-
- cat >confcache <<\_ACEOF
-@@ -18123,7 +17793,6 @@
- "bonobo/Makefile") CONFIG_FILES="$CONFIG_FILES bonobo/Makefile" ;;
- "bonobo/libbonoboui-2.0.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libbonoboui-2.0.pc" ;;
- "bonobo/libbonoboui-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libbonoboui-2.0-uninstalled.pc" ;;
-- "glade/Makefile") CONFIG_FILES="$CONFIG_FILES glade/Makefile" ;;
- "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
- "samples/controls/Makefile") CONFIG_FILES="$CONFIG_FILES samples/controls/Makefile" ;;
- "samples/bonoboui/Makefile") CONFIG_FILES="$CONFIG_FILES samples/bonoboui/Makefile" ;;
-Only in ../libbonoboui-2.24.2: configure~
-diff -ur libbonoboui-2.24.2/configure.in ../libbonoboui-2.24.2/configure.in
---- libbonoboui-2.24.2/configure.in 2009-09-22 18:11:35.000000000 -0500
-+++ ../libbonoboui-2.24.2/configure.in 2012-04-19 16:41:13.000000000 -0500
-@@ -96,11 +96,6 @@
-
- AC_SUBST(X_LIBS)
-
--# popt
--AC_CHECK_LIB(popt, poptStrippedArgv, POPT_LIBS=-lpopt, AC_MSG_ERROR([You must have popt version 1.5 or greater installed.]))
--AC_SUBST(POPT_LIBS)
--AC_CHECK_HEADER(popt.h,,AC_MSG_ERROR([Failed to find popt.h - you may have to adjust your environment]))
--
- dnl
- dnl Start of pkg-config checks
- dnl
-@@ -127,10 +122,6 @@
- AC_MSG_RESULT([clean])
- fi;
-
--PKG_CHECK_MODULES(BONOBOUI_GLADE, $BONOBOUI_MODULES libglade-2.0 >= 1.99.11)
--AC_SUBST(BONOBOUI_GLADE_CFLAGS)
--AC_SUBST(BONOBOUI_GLADE_LIBS)
--
- if test "$enable_maintainer_mode" = "yes"; then
- BONOBOUI_SINGLE_INCLUDES="-DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
- AC_SUBST(BONOBOUI_SINGLE_INCLUDES)
-@@ -150,7 +141,6 @@
- bonobo/Makefile
- bonobo/libbonoboui-2.0.pc
- bonobo/libbonoboui-2.0-uninstalled.pc
--glade/Makefile
- samples/Makefile
- samples/controls/Makefile
- samples/bonoboui/Makefile
-diff -ur libbonoboui-2.24.2/Makefile.am ../libbonoboui-2.24.2/Makefile.am
---- libbonoboui-2.24.2/Makefile.am 2009-04-23 17:38:18.000000000 -0500
-+++ ../libbonoboui-2.24.2/Makefile.am 2012-04-19 16:41:13.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = bonobo glade samples tests tools po doc
-+SUBDIRS = bonobo samples tests tools po doc
-
- libincludedir = $(includedir)/libbonoboui-2.0
- libinclude_HEADERS = \
-diff -ur libbonoboui-2.24.2/Makefile.in ../libbonoboui-2.24.2/Makefile.in
---- libbonoboui-2.24.2/Makefile.in 2009-09-22 18:12:19.000000000 -0500
-+++ ../libbonoboui-2.24.2/Makefile.in 2012-04-19 16:43:32.000000000 -0500
-@@ -138,8 +138,6 @@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- BONOBOUI_CFLAGS = @BONOBOUI_CFLAGS@
--BONOBOUI_GLADE_CFLAGS = @BONOBOUI_GLADE_CFLAGS@
--BONOBOUI_GLADE_LIBS = @BONOBOUI_GLADE_LIBS@
- BONOBOUI_LIBS = @BONOBOUI_LIBS@
- BONOBOUI_SINGLE_INCLUDES = @BONOBOUI_SINGLE_INCLUDES@
- CATALOGS = @CATALOGS@
-@@ -284,7 +282,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = bonobo glade samples tests tools po doc
-+SUBDIRS = bonobo samples tests tools po doc
- libincludedir = $(includedir)/libbonoboui-2.0
- libinclude_HEADERS = \
- bonobo.h \
-Only in ../libbonoboui-2.24.2: Makefile.in~
More information about the gnucash-changes
mailing list