[xiph-cvs] cvs commit: m4 xiph_net.m4

[Brendan]

brendan     03/07/06 23:40:00

  Modified:    .        configure.in
               .        xiph_net.m4
  Log:
  Irix portability fixes:
  1. Don't define _XOPEN_SOURCE, at least with GCC. As ALWAYS, this macro undefines
     a lot of the symbols we need. As of libshout 2.1, this define will be moved
     into the "if not $GCC" category so we don't have to deal with it so often.
  2. Irix defines inet_pton but not sockaddr_storage. We could fake it by using
     an in6 structure, but why bother? Just don't check for inet_pton unless
     we have struct sockaddr_storage.

Revision  Changes    Path
1.61      +3 -1      libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -u -r1.60 -r1.61
--- configure.in	5 Jul 2003 06:05:13 -0000	1.60
+++ configure.in	7 Jul 2003 03:39:59 -0000	1.61
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.in,v 1.60 2003/07/05 06:05:13 brendan Exp $
+# $Id: configure.in,v 1.61 2003/07/07 03:39:59 brendan Exp $
 
 m4_define(libshout_major, 2)
 m4_define(libshout_minor, 0)
@@ -44,6 +44,8 @@ case "$ac_cv_host" in
    *openbsd*)
    ;;
    *solaris*)
+   ;;
+   *irix*)
    ;;
    *) AC_DEFINE(_XOPEN_SOURCE, 600, [Define if you have POSIX and XPG specifications])
    ;;

<p><p>1.2       +8 -2      m4/xiph_net.m4

Index: xiph_net.m4
===================================================================
RCS file: /usr/local/cvsroot/m4/xiph_net.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -u -r1.1 -r1.2
--- xiph_net.m4	24 Jun 2003 21:35:44 -0000	1.1
+++ xiph_net.m4	7 Jul 2003 03:40:00 -0000	1.2
@@ -12,6 +12,12 @@ AC_SEARCH_LIBS([sethostent], [nsl],
     [Define if you have the sethostent function])])
 AC_SEARCH_LIBS([getnameinfo], [socket],
   [AC_DEFINE([HAVE_GETNAMEINFO], [1],
-    [Define if you have the inet_pton function])])
-AC_CHECK_FUNCS([endhostent getaddrinfo inet_aton inet_pton])
+    [Define if you have the getnameinfo function])])
+AC_CHECK_FUNCS([endhostent getaddrinfo inet_aton])
+
+# Irix defines INET_PTON but not sockaddr_storage!
+AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
+  [AC_CHECK_FUNCS([inet_pton])],,
+  [#include <sys/types.h> 
+#include <sys/socket.h>])
 ])

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.