patch 7.4.1226
Problem: GRESOURCE_HDR is unused.
Solution: Remove it. (Kazunobu Kuriyama)
diff --git a/src/auto/configure b/src/auto/configure
index c0d9285..fea1f2c 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -638,7 +638,6 @@
MOTIF_LIBNAME
GRESOURCE_OBJ
GRESOURCE_SRC
-GRESOURCE_HDR
GLIB_COMPILE_RESOURCES
GNOME_INCLUDEDIR
GNOME_LIBDIR
@@ -9107,7 +9106,6 @@
$as_echo "usable." >&6; }
$as_echo "#define USE_GRESOURCE 1" >>confdefs.h
- GRESOURCE_HDR="auto/gui_gtk_gresources.h"
GRESOURCE_SRC="auto/gui_gtk_gresources.c"
GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
fi
@@ -9125,7 +9123,6 @@
-
if test -z "$SKIP_MOTIF"; then
gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
diff --git a/src/config.mk.in b/src/config.mk.in
index 5f7f1d5..b514f2b 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -161,7 +161,6 @@
GTK_LIBNAME = @GTK_LIBNAME@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
-GRESOURCE_HDR = @GRESOURCE_HDR@
GRESOURCE_SRC = @GRESOURCE_SRC@
GRESOURCE_OBJ = @GRESOURCE_OBJ@
diff --git a/src/configure.in b/src/configure.in
index 467ea6b..92a1bb5 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2619,7 +2619,6 @@
else
AC_MSG_RESULT([usable.])
AC_DEFINE(USE_GRESOURCE)
- GRESOURCE_HDR="auto/gui_gtk_gresources.h"
GRESOURCE_SRC="auto/gui_gtk_gresources.c"
GRESOURCE_OBJ="objects/gui_gtk_gresources.o"
fi
@@ -2631,7 +2630,6 @@
fi
fi
AC_SUBST(GLIB_COMPILE_RESOURCES)
-AC_SUBST(GRESOURCE_HDR)
AC_SUBST(GRESOURCE_SRC)
AC_SUBST(GRESOURCE_OBJ)
diff --git a/src/version.c b/src/version.c
index 80c4eff..96a2daa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1226,
+/**/
1225,
/**/
1224,
