Fixup fromcvs/togit conversion
[minix-pkgsrc.git] / multimedia / mediatomb / patches / patch-aa
blob434ce67d8e129e2b6b774cd19615ee9213ba8042
1 $NetBSD: patch-aa,v 1.4 2012/09/25 11:45:11 ryoon Exp $
3 First chunk: automake-1.13 compat.
5 Rest:
6 Avoid dependence on "liblwres". Based on this patch for "pupnp":
8 http://pupnp.git.sourceforge.net/git/gitweb.cgi?p=pupnp/pupnp;a=commitdiff;h=5151d4520308f59c71764423c3853a35cf23e279#patch9
10 --- configure.ac.orig   2010-04-07 22:38:51.000000000 +0000
11 +++ configure.ac
12 @@ -30,7 +30,7 @@
14  AC_PREREQ(2.61)
15  AC_INIT([MediaTomb], [0.12.1], [jin@mediatomb.cc])
16 -AM_CONFIG_HEADER([autoconfig.h tombupnp/upnp/inc/upnpconfig.h])
17 +AC_CONFIG_HEADER([autoconfig.h tombupnp/upnp/inc/upnpconfig.h])
18  AC_CONFIG_AUX_DIR(configure_aux)
19  AC_CONFIG_SRCDIR([src/common.h])
20  AM_INIT_AUTOMAKE([1.9 -Wall])
21 @@ -696,20 +696,23 @@ fi
23  AC_CHECK_FUNCS([gethostbyname_r],[],
24          [
25 -            AC_CHECK_HEADERS([lwres/netdb.h],
26 -                [
27 -                    AC_CHECK_LIB(lwres, lwres_gethostbyname_r,
28 -                                 [
29 -                                    LWRES_LIBS="-llwres"
30 -                                    AC_DEFINE(HAVE_LIBLWRES, 1, [lwres library presence])
31 -                                    AC_SUBST(LWRES_LIBS)
32 -                                 ],
33 -                                 [AC_MSG_ERROR(required library function not found)])
34 -                ],
35 -                [
36 -                    if ((test $DARWIN_OS -eq 0) && (test $CYGWIN_OS -eq 0) && (test $OPENBSD_OS -eq 0)) ; then
37 -                        AC_MSG_ERROR([required header not found])
38 -                    fi
39 +            AC_CHECK_FUNCS([getaddrinfo],[],
40 +                    [
41 +                        AC_CHECK_HEADERS([lwres/netdb.h],
42 +                            [
43 +                                AC_CHECK_LIB(lwres, lwres_gethostbyname_r,
44 +                                             [
45 +                                                LWRES_LIBS="-llwres"
46 +                                                AC_DEFINE(HAVE_LIBLWRES, 1, [lwres library presence])
47 +                                                AC_SUBST(LWRES_LIBS)
48 +                                             ],
49 +                                             [AC_MSG_ERROR(required library function not found)])
50 +                            ],
51 +                            [
52 +                                if ((test $DARWIN_OS -eq 0) && (test $CYGWIN_OS -eq 0) && (test $OPENBSD_OS -eq 0)) ; then
53 +                                    AC_MSG_ERROR([required header not found])
54 +                                fi
55 +                            ])
56                  ])
57          ])