ref: f039a4fbb81a76f531df2a7b3bf405a89072bf5e
parent: 62336dee445b3938cb71600d19efe96aa96f121e
author: danchr <danchr>
date: Wed Apr 21 07:34:19 EDT 2004
build system fixes
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,17 @@
#! /bin/sh
+case $OSTYPE in
+ darwin*)
+ LIBTOOLIZE=glibtoolize
+ ;;
+ *)
+ LIBTOOLIZE=libtoolize
+ ;;
+esac
+
aclocal -I . && \
autoheader && \
-libtoolize --automake --copy && \
+$LIBTOOLIZE --automake --copy && \
automake --add-missing --copy && \
autoconf && \
echo "Ready to run ./configure"
--- a/common/mp4v2/Makefile.am
+++ b/common/mp4v2/Makefile.am
@@ -4,7 +4,7 @@
lib_LTLIBRARIES = libmp4v2.la
-include_HEADERS = mp4.h mpeg4ip.h systems.h
+include_HEADERS = mp4.h mpeg4ip.h mpeg4ip_config.h
libmp4v2_la_SOURCES = \
atom_co64.cpp \
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,7 @@
AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(common/mp4v2/mpeg4ip_config.h)
AC_ARG_WITH( xmms, [ --with-xmms compile XMMS plugins],WITHXMMS=$withval, WITHXMMS=no)
--- a/libfaad/common.h
+++ b/libfaad/common.h
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: common.h,v 1.59 2004/04/12 18:17:42 menno Exp $
+** $Id: common.h,v 1.60 2004/04/21 11:34:19 danchr Exp $
**/
#ifndef __COMMON_H__
@@ -294,7 +294,7 @@
}
- #ifdef _WIN32
+ #if defined(_WIN32) && !defined(__MINGW32__)
#define HAS_LRINTF
static INLINE int lrintf(float f)
{