[Gnash-commit] /srv/bzr/gnash/trunk r11833: don't build jemalloc on freebsd. Don't sisable shared libraries for windoze.

[Rob Savoye]

------------------------------------------------------------
revno: 11833
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-28 22:56:18 -0700
message:
  don't build jemalloc on freebsd. Don't sisable shared libraries for windoze.
modified:
  configure.ac

=== modified file 'configure.ac'
--- a/configure.ac      2010-01-28 02:33:27 +0000
+++ b/configure.ac      2010-01-29 05:56:18 +0000
@@ -276,7 +276,7 @@
 esac],jemalloc=yes)
 
 dnl There is some weird stuff going on with NetBSD and jemalloc, so don't 
build it for now.
-if test x"${netbsd}" = x"yes" -o x"${windows}" = x"yes"; then
+if test x"${netbsd}" = x"yes" -o x"${windows}" = x"yes" -o x"${freebsd}" = 
x"yes"; then
   jemalloc=no
 fi
 dnl If the compiler doesn't have local thread storage enabled, don't try to
@@ -913,12 +913,10 @@
 if test $ltmajor -eq 1; then
        AC_LIBLTDL_CONVENIENCE
        AC_LIBTOOL_DLOPEN
-       AC_LIBTOOL_WIN32_DLL
-if test x$windows = xyes; then
-       AC_DISABLE_SHARED
-else
+  if test x"${windows}" = x"yes"; then
+         AC_LIBTOOL_WIN32_DLL
+  fi
        AC_DISABLE_STATIC
-fi
 else
 dnl if test x$build_aqua = xyes; then
        dnl the Aqua-binary is always static.
@@ -929,7 +927,7 @@
 dnl fi 
        LT_INIT([dlopen win32-dll disable-static])
        LTDL_INIT([convenience recursive])
-       AC_CONFIG_FILES([libltdl/Makefile])
+  AC_CONFIG_FILES([libltdl/Makefile])
 fi
 AC_PROG_LIBTOOL
 
@@ -1321,7 +1319,7 @@
       GNASH_PATH_GLEXT
    fi
 
-  GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
+   GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
 fi
 if test x$build_hildon = xyes; then
   GNASH_PATH_HILDON