[xiph-cvs] cvs commit: libshout Makefile.am configure.in acconfig.h

[Brendan]

brendan     03/03/11 00:11:19

  Modified:    .        Makefile.am configure.in
  Removed:     .        acconfig.h
  Log:
  New type checking code, gets rid of autoheader warnings
  Probably requires newer tools than half the people have. God damn autotools,
  I hate them so much.

Revision  Changes    Path
1.5       +1 -0      libshout/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/libshout/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	8 Mar 2003 03:38:36 -0000	1.4
+++ Makefile.am	11 Mar 2003 05:11:19 -0000	1.5
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include src examples
 

<p><p>1.21      +25 -29    libshout/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/libshout/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- configure.in	11 Mar 2003 01:50:38 -0000	1.20
+++ configure.in	11 Mar 2003 05:11:19 -0000	1.21
@@ -1,6 +1,5 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/shout.c)
-AM_CONFIG_HEADER(config.h)
+# Process this file with autoconf to produce a configure script.
+# $Id: configure.in,v 1.21 2003/03/11 05:11:19 brendan Exp $
 
 m4_define(libshout_major, 2)
 m4_define(libshout_minor, 0)
@@ -9,6 +8,11 @@
   m4_if(libshout_micro, 0, libshout_major.libshout_minor,
    libshout_major.libshout_minor.libshout_micro))
 
+AC_INIT([libshout], libshout_version, [icecast at xiph.org])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR([src/shout.c])
+AM_CONFIG_HEADER([config.h])
+
 AC_DEFINE([LIBSHOUT_MAJOR], libshout_major, ["Shout library major version"])
 AC_DEFINE([LIBSHOUT_MINOR], libshout_minor, ["Shout library minor version"])
 AC_DEFINE([LIBSHOUT_MICRO], libshout_micro, ["Shout library patch version"])
@@ -51,37 +55,29 @@
 
 dnl Checks for header files.
 AC_HEADER_STDC
+AC_CHECK_HEADERS([inttypes.h sys/socket.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
 dnl Check for types
-AC_CHECK_HEADERS(stdint.h inttypes.h)
-AC_MSG_CHECKING(for C99 integer types)
-dnl This is from autoconf-2.50's AC_CHECK_TYPE macro
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#elif defined (HAVE_INTTYPES_H)
-#  include <inttypes.h>
-#endif], [
-if ((uint32_t *) 0)
-  return 0;
-if (sizeof (uint32_t))
-  return 0;
-], [
-  AC_DEFINE(HAVE_C99_INTTYPES, 1, [Define if you have the C99 integer types])
-  AC_MSG_RESULT(yes)
-], [
-  AC_MSG_RESULT(no)
-  AC_CHECK_SIZEOF(short)
-  AC_CHECK_SIZEOF(int)
-  AC_CHECK_SIZEOF(long)
-  AC_CHECK_SIZEOF(long long)
-])
-
-AC_CHECK_TYPE([socklen_t], int)
+AC_CHECK_TYPE([uint32_t],
+  [AC_DEFINE(HAVE_C99_INTTYPES, 1, [Define if you have the C99 integer types])],
+  [AC_CHECK_SIZEOF(short)
+   AC_CHECK_SIZEOF(int)
+   AC_CHECK_SIZEOF(long)
+   AC_CHECK_SIZEOF(long long)])
+AC_CHECK_TYPES([socklen_t],,,
+  [#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif])
+AH_VERBATIM([HAVE_SOCKLEN_T],
+  [#ifndef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif])
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(nanosleep)

<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.