From: kramm <kramm>
Date: Fri, 19 Dec 2008 08:08:34 +0000 (+0000)
Subject: added Makefile.new.in (if it exits), check for mmap
X-Git-Tag: release-0-9-0~663
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=5762b38f2656f53d352dd461054ba73180151ed5;p=swftools.git

added Makefile.new.in (if it exits), check for mmap
---

diff --git a/configure.in b/configure.in
index 02c64b9..4a74bdf 100644
--- a/configure.in
+++ b/configure.in
@@ -236,7 +236,7 @@ dnl Checks for header files.
  AC_HEADER_DIRENT
  AC_HEADER_STDC
 
- AC_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h)
+ AC_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/mman.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h)
 
 AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
 AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])
@@ -253,7 +253,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
  AC_CHECK_TYPE(boolean,int) #needed for jpeglib
- AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo)
+ AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat mmap lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo)
 
 AC_CHECK_SIZEOF([signed char])
 AC_CHECK_SIZEOF([signed short])
@@ -280,7 +280,7 @@ else
     if test -f lib/lame/Makefile.in; then
 	lame_in_source='$(lame_objects)'
 	lame_makefile="lib/lame/Makefile"
-	CPPFLAGS="$CPPFLAGS -Ilame"
+	CPPFLAGS="$CPPFLAGS -Ilame -Ilib/lame"
 	AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library])
     else
 	if test -d /usr/include/lame; then
@@ -542,7 +542,8 @@ AH_BOTTOM([
 
 
 if test -f "release.in"; then release_in="./release"; fi
-FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
+if test -f "Makefile.new.in"; then mk_in="./Makefile.new"; fi
+FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
 AC_OUTPUT(${FILES})
 
 dnl new autoconf