pkgs/development/libraries/libmhash/autotools-define-conflict-debian-fix.patch

   1 Patch fixing #DEFINE redefinitions for generic PACKAGE_* attributes which
   2 cause collisions when using libmhash in another package also using autotools.
   3
   4 Debian Bug report #473204
   5
   6 diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru
   7 mhash-0.9.9.orig/configure.in mhash-0.9.9/configure.in
   8 --- mhash-0.9.9.orig/configure.in       2007-04-04 19:22:28.000000000 -0700
   9 +++ mhash-0.9.9/configure.in    2008-03-29 00:21:24.000000000 -0800
  10 @@ -6,6 +6,7 @@
  11  AM_INIT_AUTOMAKE
  12
  13  AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version")
  14 +AC_CONFIG_HEADER([include/mutils/config.h])
  15  AC_CONFIG_HEADER([include/mutils/mhash_config.h])
  16
  17
  18 diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru
  19 mhash-0.9.9.orig/include/mutils/config.h.in
  20 mhash-0.9.9/include/mutils/config.h.in
  21 --- mhash-0.9.9.orig/include/mutils/config.h.in 1969-12-31 16:00:00.000000000
  22 -0800
  23 +++ mhash-0.9.9/include/mutils/config.h.in      2008-03-29 00:48:22.000000000
  24 -0800
  25 @@ -0,0 +1,22 @@
  26 +/* Name of package */
  27 +#undef PACKAGE
  28 +
  29 +/* Define to the address where bug reports for this package should be sent. */
  30 +#undef PACKAGE_BUGREPORT
  31 +
  32 +/* Define to the full name of this package. */
  33 +#undef PACKAGE_NAME
  34 +
  35 +/* Define to the full name and version of this package. */
  36 +#undef PACKAGE_STRING
  37 +
  38 +/* Define to the one symbol short name of this package. */
  39 +#undef PACKAGE_TARNAME
  40 +
  41 +/* Define to the version of this package. */
  42 +#undef PACKAGE_VERSION
  43 +
  44 +/* Version number of package */
  45 +#undef VERSION
  46 +
  47 +
  48 diff -x configure -x config.guess -x config.sub -x 'Makefile.*' -Nru
  49 mhash-0.9.9.orig/include/mutils/mhash_config.h.in
  50 mhash-0.9.9/include/mutils/mhash_config.h.in
  51 --- mhash-0.9.9.orig/include/mutils/mhash_config.h.in   2008-03-29
  52 00:23:29.000000000 -0800
  53 +++ mhash-0.9.9/include/mutils/mhash_config.h.in        2008-03-29
  54 00:06:41.000000000 -0800
  55 @@ -181,24 +181,6 @@
  56  /* Define to 1 if your C compiler doesn't accept -c and -o together. */
  57  #undef NO_MINUS_C_MINUS_O
  58
  59 -/* Name of package */
  60 -#undef PACKAGE
  61 -
  62 -/* Define to the address where bug reports for this package should be sent. */
  63 -#undef PACKAGE_BUGREPORT
  64 -
  65 -/* Define to the full name of this package. */
  66 -#undef PACKAGE_NAME
  67 -
  68 -/* Define to the full name and version of this package. */
  69 -#undef PACKAGE_STRING
  70 -
  71 -/* Define to the one symbol short name of this package. */
  72 -#undef PACKAGE_TARNAME
  73 -
  74 -/* Define to the version of this package. */
  75 -#undef PACKAGE_VERSION
  76 -
  77  /* Define to 1 if the C compiler supports function prototypes. */
  78  #undef PROTOTYPES