O_BINARY

[swftools.git] / configure.in

diff --git a/configure.in b/configure.in
index ecd33a3..444e533 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debugging], DEBUG=true)
 
 PACKAGE=swftools
-VERSION=0.4.4-pre6
+VERSION=0.4.4-pre11
 # -Winline?
 
 if test "x$CHECKMEM" '!=' "x";then
@@ -16,6 +16,9 @@ fi
 if test "x$DEBUG" '!=' "x";then
     CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CFLAGS"
     CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CXXFLAGS"
+    STRIP="echo debug enabled, not stripping "
+    export STRIP
+    AC_SUBST(STRIP)
 else
     CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CFLAGS"
     CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CXXFLAGS"
@@ -60,6 +63,9 @@ dnl Checks for system services
 
 RFX_CHECK_MING
 
+if test "x${MINGW}" != "xyes"; then
+    AC_DEFINE_UNQUOTED(O_BINARY, 0)
+fi
 # The following tries to make use of includes and libraries in
 # /usr/local, too. Notice: A -I/usr/local/include might break
 # things (MingW, cross-compiling etc.) in the same way as -I/usr/include, 
@@ -73,6 +79,14 @@ if test -d /usr/local/include; then
 #   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
     echo > /dev/null
 fi
+if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/local/"; then
+    # if the user has a special prefix (like /opt), there might also be $prefix/lib
+    # and $prefix/include, which should be included in our search paths for libraries
+    # and includes.
+    LDFLAGS="$LDFLAGS -L${libdir}"
+    CPPFLAGS="$CPPFLAGS -I${includedir}"
+    # TODO- test whether gcc still works after this
+fi
 
 dnl Checks for libraries.
  AC_CHECK_LIB(m, sin,,