--- configure.orig Wed Mar 3 19:44:51 2004 +++ configure Wed Mar 3 19:45:23 2004 @@ -463,7 +463,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBGNOMEUI_CURRENT LIBGNOMEUI_REVISION LIBGNOMEUI_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC PATH_TO_XRDB GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir WARN_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SM_LIBS PKG_CONFIG SOUND_TEST_CFLAGS SOUND_TEST_LIBS LIBJPEG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOMEUI_COMPONENTS_CFLAGS LIBGNOMEUI_COMPONENTS_LIBS LIBGNOMEUI_DEMOS_CFLAGS LIBGNOMEUI_DEMOS_LIBS LIBGNOMEUI_GLADE_CFLAGS LIBGNOMEUI_GLADE_LIBS LIBGLADE_CONVERT FILE_SYSTEM_CFLAGS FILE_SYSTEM_LIBS GTK_VERSION HTML_DIR GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GCONF_CONFIG_SOURCE INSTALL_GCONF_CONFIG_SOURCE GDK_PIXBUF_CSOURCE AWK PERL GCONFTOOL REBUILD LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBGNOMEUI_CURRENT LIBGNOMEUI_REVISION LIBGNOMEUI_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC PATH_TO_XRDB GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir WARN_CFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS SM_LIBS PKG_CONFIG SOUND_TEST_CFLAGS SOUND_TEST_LIBS LIBJPEG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOMEUI_COMPONENTS_CFLAGS LIBGNOMEUI_COMPONENTS_LIBS LIBGNOMEUI_DEMOS_CFLAGS LIBGNOMEUI_DEMOS_LIBS LIBGNOMEUI_GLADE_CFLAGS LIBGNOMEUI_GLADE_LIBS LIBGLADE_CONVERT FILE_SYSTEM_CFLAGS FILE_SYSTEM_LIBS GTK_VERSION GTK_BINARY_VERSION HTML_DIR GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GCONF_CONFIG_SOURCE INSTALL_GCONF_CONFIG_SOURCE GDK_PIXBUF_CSOURCE AWK PERL GCONFTOOL REBUILD LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -23962,12 +23962,12 @@ { (exit 1); exit 1; }; } fi -GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` -GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` @@ -25384,6 +25384,7 @@ s,@FILE_SYSTEM_CFLAGS@,$FILE_SYSTEM_CFLAGS,;t t s,@FILE_SYSTEM_LIBS@,$FILE_SYSTEM_LIBS,;t t s,@GTK_VERSION@,$GTK_VERSION,;t t +s,@GTK_BINARY_VERSION@,$GTK_BINARY_VERSION,;t t s,@HTML_DIR@,$HTML_DIR,;t t s,@GTKDOC@,$GTKDOC,;t t s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t