glib-2.0.m4		glib-2.0.m4
	skipping to change at line 94		skipping to change at line 94
	dnl		dnl
	rm -f conf.glibtest		rm -f conf.glibtest
	AC_TRY_RUN([		AC_TRY_RUN([
	#include <glib.h>		#include <glib.h>
	#include <stdio.h>		#include <stdio.h>
	#include <stdlib.h>		#include <stdlib.h>
	int		int
	main ()		main ()
	{		{
	int major, minor, micro;		unsigned int major, minor, micro;
	char *tmp_version;		char *tmp_version;
	fclose (fopen ("conf.glibtest", "w"));		fclose (fopen ("conf.glibtest", "w"));
	/* HP/UX 9 (%@#!) writes to sscanf strings */		/* HP/UX 9 (%@#!) writes to sscanf strings */
	tmp_version = g_strdup("$min_glib_version");		tmp_version = g_strdup("$min_glib_version");
	if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {		if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
	printf("%s, bad version string\n", "$min_glib_version");		printf("%s, bad version string\n", "$min_glib_version");
	exit(1);		exit(1);
	}		}
	if ((glib_major_version != $glib_config_major_version) ||		if ((glib_major_version != $glib_config_major_version) ||
	(glib_minor_version != $glib_config_minor_version) ||		(glib_minor_version != $glib_config_minor_version) ||
	(glib_micro_version != $glib_config_micro_version))		(glib_micro_version != $glib_config_micro_version))
	{		{
	printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, b ut GLIB (%d.%d.%d)\n",		printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, b ut GLIB (%d.%d.%d)\n",
	$glib_config_major_version, $glib_config_minor_version, $glib_ config_micro_version,		$glib_config_major_version, $glib_config_minor_version, $glib_ config_micro_version,
	skipping to change at line 140		skipping to change at line 140
	else		else
	{		{
	if ((glib_major_version > major) ||		if ((glib_major_version > major) ||
	((glib_major_version == major) && (glib_minor_version > minor)) ||		((glib_major_version == major) && (glib_minor_version > minor)) ||
	((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))		((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
	{		{
	return 0;		return 0;
	}		}
	else		else
	{		{
	printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",		printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n",
	glib_major_version, glib_minor_version, glib_micro_version);		glib_major_version, glib_minor_version, glib_micro_version);
	printf("*** You need a version of GLIB newer than %d.%d.%d. The lat est version of\n",		printf("*** You need a version of GLIB newer than %u.%u.%u. The lat est version of\n",
	major, minor, micro);		major, minor, micro);
	printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");		printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
	printf("***\n");		printf("***\n");
	printf("*** If you have already installed a sufficiently new versio n, this error\n");		printf("*** If you have already installed a sufficiently new versio n, this error\n");
	printf("*** probably means that the wrong copy of the pkg-config sh ell script is\n");		printf("*** probably means that the wrong copy of the pkg-config sh ell script is\n");
	printf("*** being found. The easiest way to fix this is to remove t he old version\n");		printf("*** being found. The easiest way to fix this is to remove t he old version\n");
	printf("*** of GLIB, but you can also set the PKG_CONFIG environmen t to point to the\n");		printf("*** of GLIB, but you can also set the PKG_CONFIG environmen t to point to the\n");
	printf("*** correct copy of pkg-config. (In this case, you will hav e to\n");		printf("*** correct copy of pkg-config. (In this case, you will hav e to\n");
	printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edi t /etc/ld.so.conf\n");		printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edi t /etc/ld.so.conf\n");
	printf("*** so that the correct libraries are found at run-time))\n ");		printf("*** so that the correct libraries are found at run-time))\n ");
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/