dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac: remove old outdated code. 

There was still code for a warning, now irrelevant as it was about
non-recommended GTK+2 version for Windows. Anyway this is now removed.
This commit is contained in:
Jehan 2019-02-05 15:33:02 +01:00
parent 757b8bba7d
commit 60d407ac21
1 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -159,7 +159,6 @@ GEGL_REQUIRED_VERSION=gegl_required_version
GEXIV2_REQUIRED_VERSION=gexiv2_required_version GEXIV2_REQUIRED_VERSION=gexiv2_required_version
GLIB_REQUIRED_VERSION=glib_required_version GLIB_REQUIRED_VERSION=glib_required_version
GTK_REQUIRED_VERSION=gtk_required_version GTK_REQUIRED_VERSION=gtk_required_version
GTK_WIN32_RECOMMENDED_VERSION=gtk_win32_recommended_version
HARFBUZZ_REQUIRED_VERSION=harfbuzz_required_version HARFBUZZ_REQUIRED_VERSION=harfbuzz_required_version
INTLTOOL_REQUIRED_VERSION=intltool_required_version INTLTOOL_REQUIRED_VERSION=intltool_required_version
LCMS_REQUIRED_VERSION=lcms_required_version LCMS_REQUIRED_VERSION=lcms_required_version
@ -193,7 +192,6 @@ AC_SUBST(GEGL_REQUIRED_VERSION)
AC_SUBST(GEXIV2_REQUIRED_VERSION) AC_SUBST(GEXIV2_REQUIRED_VERSION)
AC_SUBST(GLIB_REQUIRED_VERSION) AC_SUBST(GLIB_REQUIRED_VERSION)
AC_SUBST(GTK_REQUIRED_VERSION) AC_SUBST(GTK_REQUIRED_VERSION)
AC_SUBST(GTK_WIN32_RECOMMENDED_VERSION)
AC_SUBST(HARFBUZZ_REQUIRED_VERSION) AC_SUBST(HARFBUZZ_REQUIRED_VERSION)
AC_SUBST(INTLTOOL_REQUIRED_VERSION) AC_SUBST(INTLTOOL_REQUIRED_VERSION)
AC_SUBST(LCMS_REQUIRED_VERSION) AC_SUBST(LCMS_REQUIRED_VERSION)
@ -2364,9 +2362,6 @@ AC_ARG_ENABLE(vector-icons, [ --disable-vector-icons use raster icons rather t
enable_vector_icons=auto) enable_vector_icons=auto)
if test "x$enable_vector_icons" != "xno"; then if test "x$enable_vector_icons" != "xno"; then
if test "x$have_recommended_gtk" != "x"; then
enable_vector_icons="no (gtk+-2-0 < gtk_win32_recommended_version)"
else
have_shared_mime_info="" have_shared_mime_info=""
# shared-mime-info is needed to correctly detect SVG files (except on # shared-mime-info is needed to correctly detect SVG files (except on
# Windows, apparently). # Windows, apparently).
@ -2406,7 +2401,6 @@ WARNING: You enabled vector icons on Win32. Make sure to run:
else else
enable_vector_icons="no (missing shared-mime-info)" enable_vector_icons="no (missing shared-mime-info)"
fi fi
fi
fi fi
AC_SUBST(NATIVE_GLIB_LIBS) AC_SUBST(NATIVE_GLIB_LIBS)
@ -3035,7 +3029,7 @@ Tests:
Test desktop file $have_desktop_file_validate Test desktop file $have_desktop_file_validate
Bug report URL: $with_bug_report_url Bug report URL: $with_bug_report_url
$override_bug_report_url$have_recommended_gtk$warning_vector_icons_windows$warning_glib_networking$warning_gcc" $override_bug_report_url$warning_vector_icons_windows$warning_glib_networking$warning_gcc"
if test "x$required_deps" = "x"; then if test "x$required_deps" = "x"; then
AC_OUTPUT AC_OUTPUT