fixed merge conflict

[swftools.git] / configure.in

diff --git a/configure.in b/configure.in
index 7fda6b9..1a5efbe 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -90,6 +90,7 @@ dnl Checks for programs.
 
 AC_CANONICAL_HOST
 
+SLEXT="so"
 SHARED="-shared"
 MACOSX=
 case $host_os in
@@ -98,6 +99,7 @@ case $host_os in
        CFLAGS="$CFLAGS"
        CXXFLAGS="$CXXFLAGS -fno-rtti"
        SHARED="-bundle"
+       SLEXT="bundle"
        if test -d /opt/local/include && test -d /opt/local/lib; then
            CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
            LDFLAGS="${LDFLAGS} -L/opt/local/lib"
@@ -168,7 +170,6 @@ AC_SUBST(AREXT)
 
 RFX_CHECK_MING
 
-SLEXT="so"
 if test "x${MINGW}" != "xyes"; then
     # no mingW
     AC_DEFINE([O_BINARY], [0], [Not defined on mingw])
@@ -271,7 +272,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 mmap 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 open64)
 
 AC_CHECK_SIZEOF([signed char])
 AC_CHECK_SIZEOF([signed short])