From: Jose V Beneyto Date: Tue, 2 Nov 2010 08:42:10 +0000 (+0100) Subject: sylpheed: initial import (verified compilation) X-Git-Url: http://gitweb/?a=commitdiff_plain;h=3cca951b2a879d8aa4a262070346055ee4599362;p=attic%2Fports%2Fopt-cross.git sylpheed: initial import (verified compilation) --- diff --git a/sylpheed/.footprint b/sylpheed/.footprint new file mode 100644 index 0000000..0fbc7e0 --- /dev/null +++ b/sylpheed/.footprint @@ -0,0 +1,59 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/sylpheed +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/sylpheed/ +-rw-r--r-- root/root usr/include/sylpheed/plugin.h +drwxr-xr-x root/root usr/include/sylpheed/sylph/ +-rw-r--r-- root/root usr/include/sylpheed/sylph/account.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/base64.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/codeconv.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/customheader.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/defs.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/displayheader.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/enums.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/filter.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/folder.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/html.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/imap.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/mbox.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/md5.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/md5_hmac.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/mh.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/news.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/nntp.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/pop.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/prefs.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/prefs_account.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/prefs_common.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/procheader.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/procmime.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/procmsg.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/quoted-printable.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/recv.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/session.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/smtp.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/socket.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/ssl.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/stringtable.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/syl-marshal.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/sylmain.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/unmime.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/utils.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/uuencode.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/virtual.h +-rw-r--r-- root/root usr/include/sylpheed/sylph/xml.h +drwxr-xr-x root/root usr/lib/ +-rwxr-xr-x root/root usr/lib/libsylph-0.la +lrwxrwxrwx root/root usr/lib/libsylph-0.so -> libsylph-0.so.1.0.3 +lrwxrwxrwx root/root usr/lib/libsylph-0.so.1 -> libsylph-0.so.1.0.3 +-rwxr-xr-x root/root usr/lib/libsylph-0.so.1.0.3 +-rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.la +lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so -> libsylpheed-plugin-0.so.1.0.3 +lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so.1 -> libsylpheed-plugin-0.so.1.0.3 +-rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.so.1.0.3 +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/applications/ +-rw-r--r-- root/root usr/share/applications/sylpheed.desktop +drwxr-xr-x root/root usr/share/pixmaps/ +-rw-r--r-- root/root usr/share/pixmaps/sylpheed.png diff --git a/sylpheed/.md5sum b/sylpheed/.md5sum new file mode 100644 index 0000000..9a11876 --- /dev/null +++ b/sylpheed/.md5sum @@ -0,0 +1,2 @@ +95d4544db197a86540203f8078ff5154 sylpheed-3.0.3-cross_compile.patch +0428c2625961d76ecb62f3965eb6ee88 sylpheed-3.0.3.tar.bz2 diff --git a/sylpheed/Pkgfile b/sylpheed/Pkgfile new file mode 100644 index 0000000..16b5ace --- /dev/null +++ b/sylpheed/Pkgfile @@ -0,0 +1,45 @@ +# Description: GTK+ email client and news reader +# URL: http://sylpheed.sraoss.jp/en/ +# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de +# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu +# Depends on: gtk openssl + +name=sylpheed +version=3.0.3 +release=1 +source=(http://sylpheed.sraoss.jp/sylpheed/v3.0/$name-$version.tar.bz2 \ + $name-$version-cross_compile.patch) + +build () { + cd $name-$version + + patch -p1 -i $SRC/$name-$version-cross_compile.patch + + export OPENSSL_LIBS="-lssl -lcrypto -ldl" + export OPENSSL_CFLAGS="" + + export GLIB_LIBS="-pthread -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0" + export GLIB_CFLAGS="-pthread -I$CLFS/usr/include/glib-2.0 -I$CLFS/usr/lib/glib-2.0/include" + + export GTK_LIBS="$GLIB_LIBS -pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig" + export GTK_CFLAGS="-I$CLFS/usr/include -pthread -I$CLFS/usr/include/gtk-2.0 -I$CLFS/usr/lib/gtk-2.0/include -I$CLFS/usr/include/atk-1.0 -I$CLFS/usr/include/cairo -I$CLFS/usr/include/pango-1.0 -I$CLFS/usr/include/pixman-1 -I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/libpng12" + + # here 'includedir' is used in the compilation stage for headers + ./configure --build=$CHOST \ + --host=$CTARGET \ + --prefix=/usr \ + --includedir=$CLFS/usr/include \ + --disable-gtktest \ + --disable-glibtest + + make + # and here 'includedir' is used in the installation stage + make DESTDIR=$PKG includedir=/usr/include install + + sed -ri '/\[.+\]=/d' sylpheed.desktop + install -d $PKG/usr/share/{applications,pixmaps} + install -m 0644 sylpheed.desktop $PKG/usr/share/applications + install -m 0644 sylpheed.png $PKG/usr/share/pixmaps + + rm -r $PKG/usr/share/{locale,sylpheed} +} diff --git a/sylpheed/sylpheed-3.0.3-cross_compile.patch b/sylpheed/sylpheed-3.0.3-cross_compile.patch new file mode 100644 index 0000000..00a4a29 --- /dev/null +++ b/sylpheed/sylpheed-3.0.3-cross_compile.patch @@ -0,0 +1,533 @@ +diff -purN sylpheed-3.0.3.orig/configure sylpheed-3.0.3/configure +--- sylpheed-3.0.3.orig/configure 2010-11-01 18:00:58.000000000 +0000 ++++ sylpheed-3.0.3/configure 2010-11-02 07:44:40.000000000 +0000 +@@ -20651,252 +20651,16 @@ fi + { echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5 + echo $ECHO_N "checking for GLIB - version >= $min_glib_version... $ECHO_C" >&6; } + +- if test x$PKG_CONFIG != xno ; then +- ## don't try to run the test against uninstalled libtool libs +- if $PKG_CONFIG --uninstalled $pkg_config_args; then +- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" +- enable_glibtest=no +- fi +- +- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then +- : +- else +- no_glib=yes +- fi +- fi +- +- if test x"$no_glib" = x ; then +- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` +- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +- +- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` +- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` +- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` +- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` +- if test "x$enable_glibtest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$GLIB_LIBS $LIBS" +- rm -f conf.glibtest +- if test "$cross_compiling" = yes; then +- echo $ac_n "cross compiling; assumed OK... $ac_c" +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-#include +-#include +- +-int +-main () +-{ +- int major, minor, micro; +- char *tmp_version; +- +- system ("touch conf.glibtest"); +- +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = g_strdup("$min_glib_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_glib_version"); +- exit(1); +- } +- +- if ((glib_major_version != $glib_config_major_version) || +- (glib_minor_version != $glib_config_minor_version) || +- (glib_micro_version != $glib_config_micro_version)) +- { +- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", +- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, +- glib_major_version, glib_minor_version, glib_micro_version); +- printf ("*** was found! If pkg-config was correct, then it is best\n"); +- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); +- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); +- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); +- printf("*** required on your system.\n"); +- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); +- printf("*** to point to the correct configuration files\n"); +- } +- else if ((glib_major_version != GLIB_MAJOR_VERSION) || +- (glib_minor_version != GLIB_MINOR_VERSION) || +- (glib_micro_version != GLIB_MICRO_VERSION)) +- { +- printf("*** GLIB header files (version %d.%d.%d) do not match\n", +- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); +- printf("*** library (version %d.%d.%d)\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- } +- else +- { +- if ((glib_major_version > major) || +- ((glib_major_version == major) && (glib_minor_version > minor)) || +- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); +- printf("***\n"); +- printf("*** If you have already installed a sufficiently new version, this error\n"); +- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); +- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); +- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** so that the correct libraries are found at run-time))\n"); +- } +- } +- return 1; +-} +- +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-no_glib=yes ++if test "$cross_compiling" = yes; then ++ enable_glibtest=no ++ no_glib= ++ GLIB_LIBS="$GLIB_LIBS" ++ GLIB_CFLAGS="$GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++ CFLAGS="$GLIB_CFLAGS $CFLAGS" ++ echo "$as_me:$LINENO: result: yes" >&5 ++ echo "${ECHO_T}yes" >&6 + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_glib" = x ; then +- { echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +-echo "${ECHO_T}yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } +- : +- else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** A new enough version of pkg-config was not found." +- echo "*** See http://www.freedesktop.org/software/pkgconfig/" +- else +- if test -f conf.glibtest ; then +- : +- else +- echo "*** Could not run GLIB test program, checking why..." +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$LIBS $GLIB_LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-#include +- +-int +-main () +-{ +- return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); +- ; +- 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 "echo \"\$as_me:$LINENO: $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 +- 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 && +- $as_test_x conftest$ac_exeext; then +- echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding GLIB or finding the wrong" +- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means GLIB is incorrectly installed." +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- GLIB_CFLAGS="" +- GLIB_LIBS="" +- GLIB_GENMARSHAL="" +- GOBJECT_QUERY="" +- GLIB_MKENUMS="" +- { { echo "$as_me:$LINENO: error: Test for GLib failed. See the 'INSTALL' for help." >&5 +-echo "$as_me: error: Test for GLib failed. See the 'INSTALL' for help." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- +- +- +- rm -f conf.glibtest +- + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. + set dummy glib-genmarshal; ac_word=$2 +@@ -21017,243 +20781,17 @@ fi + { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 + echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; } + +- if test x$PKG_CONFIG != xno ; then +- ## don't try to run the test against uninstalled libtool libs +- if $PKG_CONFIG --uninstalled $pkg_config_args; then +- echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" +- enable_gtktest=no +- fi +- +- if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then +- : +- else +- no_gtk=yes +- fi ++ if test "$cross_compiling" = yes; then ++ enable_gtktest=no ++ no_gtk= ++ GTK_CFLAGS="$GTK_CFLAGS" ++ GTK_LIBS="$GTK_LIBS" ++ CFLAGS="$CFLAGS $GTK_CFLAGS" ++ LIBS="$GTK_LIBS $LIBS" ++ echo "$as_me:$LINENO: result: yes" >&5 ++ echo "${ECHO_T}yes" >&6 + fi + +- if test x"$no_gtk" = x ; then +- GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` +- GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` +- gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +- gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` +- gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ +- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` +- if test "x$enable_gtktest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GTK_CFLAGS" +- LIBS="$GTK_LIBS $LIBS" +- rm -f conf.gtktest +- if test "$cross_compiling" = yes; then +- echo $ac_n "cross compiling; assumed OK... $ac_c" +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-#include +-#include +- +-int +-main () +-{ +- int major, minor, micro; +- char *tmp_version; +- +- system ("touch conf.gtktest"); +- +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = g_strdup("$min_gtk_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_gtk_version"); +- exit(1); +- } +- +- if ((gtk_major_version != $gtk_config_major_version) || +- (gtk_minor_version != $gtk_config_minor_version) || +- (gtk_micro_version != $gtk_config_micro_version)) +- { +- printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", +- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, +- gtk_major_version, gtk_minor_version, gtk_micro_version); +- printf ("*** was found! If pkg-config was correct, then it is best\n"); +- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); +- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); +- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); +- printf("*** required on your system.\n"); +- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); +- printf("*** to point to the correct configuration files\n"); +- } +- else if ((gtk_major_version != GTK_MAJOR_VERSION) || +- (gtk_minor_version != GTK_MINOR_VERSION) || +- (gtk_micro_version != GTK_MICRO_VERSION)) +- { +- printf("*** GTK+ header files (version %d.%d.%d) do not match\n", +- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); +- printf("*** library (version %d.%d.%d)\n", +- gtk_major_version, gtk_minor_version, gtk_micro_version); +- } +- else +- { +- if ((gtk_major_version > major) || +- ((gtk_major_version == major) && (gtk_minor_version > minor)) || +- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", +- gtk_major_version, gtk_minor_version, gtk_micro_version); +- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); +- printf("***\n"); +- printf("*** If you have already installed a sufficiently new version, this error\n"); +- printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); +- printf("*** correct copy of pkg-config. (In this case, you will have to\n"); +- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); +- printf("*** so that the correct libraries are found at run-time))\n"); +- } +- } +- return 1; +-} +- +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- : +-else +- echo "$as_me: program exited with status $ac_status" >&5 +-echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-no_gtk=yes +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_gtk" = x ; then +- { echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 +-echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; } +- : +- else +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** A new enough version of pkg-config was not found." +- echo "*** See http://pkgconfig.sourceforge.net" +- else +- if test -f conf.gtktest ; then +- : +- else +- echo "*** Could not run GTK+ test program, checking why..." +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GTK_CFLAGS" +- LIBS="$LIBS $GTK_LIBS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-#include +- +-int +-main () +-{ +- return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); +- ; +- 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 "echo \"\$as_me:$LINENO: $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 +- 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 && +- $as_test_x conftest$ac_exeext; then +- echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding GTK+ or finding the wrong" +- echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means GTK+ is incorrectly installed." +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- GTK_CFLAGS="" +- GTK_LIBS="" +- { { echo "$as_me:$LINENO: error: Test for Gtk failed. See the 'INSTALL' for help." >&5 +-echo "$as_me: error: Test for Gtk failed. See the 'INSTALL' for help." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- rm -f conf.gtktest +- +- + # Check whether --enable-deprecated was given. + if test "${enable_deprecated+set}" = set; then + enableval=$enable_deprecated; GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" +@@ -25590,8 +25128,12 @@ if test x"$use_threads" = xyes ; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + if $PKG_CONFIG --exists gthread-2.0 ; then +- CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gthread-2.0`" +- LIBS="$LIBS `$PKG_CONFIG --libs gthread-2.0`" ++ if test "$cross_compiling" = yes; then ++ : ++ else ++ CFLAGS="$CFLAGS `$PKG_CONFIG --cflags gthread-2.0`" ++ LIBS="$LIBS `$PKG_CONFIG --libs gthread-2.0`" ++ fi + + cat >>confdefs.h <<\_ACEOF + #define USE_THREADS 1