X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=36028219d14d53c8a7ac663875d3606f35f38535;hb=08413f49a157383b76b52520bd9d69e13250901e;hp=0f8e79991ba0e7f5b4f623b8030a5a1fee0b13a0;hpb=5a16f12063d78a79d6ec5d6defb0d68f2829f8e8;p=swftools.git

diff --git a/configure.in b/configure.in
index 0f8e799..3602821 100644
--- a/configure.in
+++ b/configure.in
@@ -2,12 +2,23 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/)
 
 PACKAGE=swftools
-VERSION=0.4.0
-CFLAGS="-Winline -Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer"
-CXXFLAGS="-Winline -Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer"
+VERSION=0.4.3
+# -Winline?
+CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer $CFLAGS"
+CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer $CXXFLAGS"
 export PACKAGE VERSION CFLAGS CXXFLAGS
 
 dnl Checks for programs.
+ AC_CANONICAL_HOST
+MACOSX=
+case $host_os in
+    *darwin* ) 
+	MACOSX=yes
+	CFLAGS="$CFLAGS -fno-rtti"
+	CXXFLAGS="$CXXFLAGS -fno-rtti"
+	;;
+esac
+dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CPP
  AC_PROG_CXX
@@ -21,6 +32,20 @@ dnl Checks for programs.
 dnl Checks for system services
  AC_EXEEXT
 
+# 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, 
+# especially on systems which link /usr/local to /usr, so it has yet
+# to be seen how useful this is.
+if test -d /usr/local/lib; then
+    LDFLAGS="$LDFLAGS -L/usr/local/lib"
+fi
+if test -d /usr/local/include; then
+# Leave that alone. It's causing trouble e.g. with gcc 3.2 on gentoo.
+#   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+    echo > /dev/null
+fi
+
 dnl Checks for libraries.
  AC_CHECK_LIB(m, sin,, 
  echo "Error: Math library not found.";
@@ -49,14 +74,8 @@ AC_SUBST(SYSTEM_BACKTICKS)
 
 AC_ARG_PROGRAM
 
-dnl do we need those?
-dnl AC_CHECK_LIB(pthread, pthread_create)
-dnl AC_CHECK_LIB(X11, XFlush)
-
 dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
-dnl AC_PATH_X
-dnl AC_PATH_XTRA
  AC_HEADER_DIRENT
  AC_HEADER_STDC
  AC_CHECK_HEADERS(zlib.h jpeglib.h t1lib.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h)
@@ -105,9 +124,7 @@ avi2swf="avi2swf/Makefile"
 if test "x${AVIFILE}" != "xtrue"; then
  echo "* Couldn't compile the avifile test program."
  echo "* Disabling avi2swf tool..."
- echo all: > avi2swf/Makefile
- echo install: >> avi2swf/Makefile
- echo clean: >> avi2swf/Makefile
+ echo all install uninstall clean: > avi2swf/Makefile
  avi2swf=
 fi
 
@@ -123,19 +140,20 @@ if test "x${DISABLEPDF2SWF}" = "xtrue"; then
   echo "The following headers/libraries are missing: " ${MISSINGLIBS}
   echo "Disabling pdf2swf tool..."
   rm -f pdf2swf/Makefile
-  echo all: > pdf2swf/Makefile
-  echo install: >> pdf2swf/Makefile
-  echo clean: >> pdf2swf/Makefile
+  echo all install uninstall clean: > pdf2swf/Makefile
   if test "x${DISABLEJPEG2SWF}" = "xtrue"; then
     echo "Disabling jpeg2swf tool..."
     JPEG2SWF=
     export JPEG2SWF
   fi
   echo "***************************************************"
-  FILES="./release ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile swfs/Makefile"
+  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile swfs/Makefile"
 else
-  FILES="./release ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile pdf2swf/fonts/Makefile swfs/Makefile"
+  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile swfs/Makefile"
 fi
 AC_SUBST(JPEG2SWF)
 
+AR=ar
+AC_SUBST(AR)
+
 AC_OUTPUT(${FILES})