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 -_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 -_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 . -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 . -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~