<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40416 >
2008/8/7 Daniel Markstedt:
>
> It seems you were right. Attached patch solves the error. Who will bring
> it upstream?
It's not typo, but new macro replacing AC_HELP_STRING. Since syntax
here is identical, and AC_HELP_STRING is not yet deprecated (even in
latest autoconf version), we can use AC_HELP_STRING.
In general, my opinion abotu modifying upstream m4-files is that we
can do that, but with some precautions. Never change m4-files so that
upstream upgrade wiping local modifications will later leave us in to
worse situation than if we never had those local modifications.
Maintain local serial number that fits between upstream serial
numbers. When updating m4-files from upstream, check from version
control what local changes have been applied to previous version.
Attached is Daniel's patch with serial number change added.
- ML
diff -Nurd -X.diff_ignore freeciv/m4/freetype2.m4 freeciv/m4/freetype2.m4
--- freeciv/m4/freetype2.m4 2008-07-31 23:27:48.000000000 +0300
+++ freeciv/m4/freetype2.m4 2008-08-09 03:34:33.000000000 +0300
@@ -15,7 +15,10 @@
# generated by Autoconf, under the same distribution terms as the rest of
# that program.
#
-# serial 2
+# First part is upstream (freetype2) version,
+# second is zero just in case upstream will use it,
+# third one is Freeciv modifications.
+# serial 2.0.1
# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
@@ -26,22 +29,22 @@
[# Get the cflags and libraries from the freetype-config script
#
AC_ARG_WITH([ft-prefix],
- dnl don't quote AS_HELP_STRING!
- AS_HELP_STRING([--with-ft-prefix=PREFIX],
+ dnl don't quote AC_HELP_STRING!
+ AC_HELP_STRING([--with-ft-prefix=PREFIX],
[Prefix where FreeType is installed (optional)]),
[ft_config_prefix="$withval"],
[ft_config_prefix=""])
AC_ARG_WITH([ft-exec-prefix],
- dnl don't quote AS_HELP_STRING!
- AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
+ dnl don't quote AC_HELP_STRING!
+ AC_HELP_STRING([--with-ft-exec-prefix=PREFIX],
[Exec prefix where FreeType is installed (optional)]),
[ft_config_exec_prefix="$withval"],
[ft_config_exec_prefix=""])
AC_ARG_ENABLE([freetypetest],
- dnl don't quote AS_HELP_STRING!
- AS_HELP_STRING([--disable-freetypetest],
+ dnl don't quote AC_HELP_STRING!
+ AC_HELP_STRING([--disable-freetypetest],
[Do not try to compile and run a test FreeType program]),
[],
[enable_fttest=yes])
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
