1.1 --- a/configure	Sun Feb 12 16:30:26 2012 +1000
     1.2 +++ b/configure	Thu Feb 23 08:41:07 2012 +1000
     1.3 @@ -733,8 +733,8 @@
     1.4  PLUGINCFLAGS
     1.5  PLUGINLDFLAGS
     1.6  LXDREAMLDFLAGS
     1.7 -BUILD_SHARED_TRUE
     1.8 -BUILD_SHARED_FALSE
     1.9 +BUILD_PLUGINS_TRUE
    1.10 +BUILD_PLUGINS_FALSE
    1.11  LXDREAMCPPFLAGS
    1.12  PKG_CONFIG
    1.13  LIBPNG_CFLAGS
    1.14 @@ -9445,11 +9445,6 @@
    1.15  fi
    1.16  
    1.17  if test "x$enable_shared" != "xno"; then
    1.18 -
    1.19 -cat >>confdefs.h <<\_ACEOF
    1.20 -#define ENABLE_SHARED 1
    1.21 -_ACEOF
    1.22 -
    1.23     if test "x$APPLE_BUILD" = "xyes"; then
    1.24        SOEXT="dylib"
    1.25        PLUGINLDFLAGS="-dynamiclib -undefined dynamic_lookup"
    1.26 @@ -9737,14 +9732,21 @@
    1.27  
    1.28  
    1.29  fi
    1.30 -
    1.31 -
    1.32  if test "x$have_dlopen" = "xyes"; then
    1.33 -  BUILD_SHARED_TRUE=
    1.34 -  BUILD_SHARED_FALSE='#'
    1.35 -else
    1.36 -  BUILD_SHARED_TRUE='#'
    1.37 -  BUILD_SHARED_FALSE=
    1.38 +
    1.39 +cat >>confdefs.h <<\_ACEOF
    1.40 +#define BUILD_PLUGINS 1
    1.41 +_ACEOF
    1.42 +
    1.43 +fi
    1.44 +
    1.45 +
    1.46 +if test "x$have_dlopen" = "xyes"; then
    1.47 +  BUILD_PLUGINS_TRUE=
    1.48 +  BUILD_PLUGINS_FALSE='#'
    1.49 +else
    1.50 +  BUILD_PLUGINS_TRUE='#'
    1.51 +  BUILD_PLUGINS_FALSE=
    1.52  fi
    1.53  
    1.54  
    1.55 @@ -15555,10 +15557,10 @@
    1.56  Usually this means the macro was only invoked conditionally." >&2;}
    1.57     { (exit 1); exit 1; }; }
    1.58  fi
    1.59 -if test -z "${BUILD_SHARED_TRUE}" && test -z "${BUILD_SHARED_FALSE}"; then
    1.60 -  { { echo "$as_me:$LINENO: error: conditional \"BUILD_SHARED\" was never defined.
    1.61 -Usually this means the macro was only invoked conditionally." >&5
    1.62 -echo "$as_me: error: conditional \"BUILD_SHARED\" was never defined.
    1.63 +if test -z "${BUILD_PLUGINS_TRUE}" && test -z "${BUILD_PLUGINS_FALSE}"; then
    1.64 +  { { echo "$as_me:$LINENO: error: conditional \"BUILD_PLUGINS\" was never defined.
    1.65 +Usually this means the macro was only invoked conditionally." >&5
    1.66 +echo "$as_me: error: conditional \"BUILD_PLUGINS\" was never defined.
    1.67  Usually this means the macro was only invoked conditionally." >&2;}
    1.68     { (exit 1); exit 1; }; }
    1.69  fi
    1.70 @@ -16380,8 +16382,8 @@
    1.71  PLUGINCFLAGS!$PLUGINCFLAGS$ac_delim
    1.72  PLUGINLDFLAGS!$PLUGINLDFLAGS$ac_delim
    1.73  LXDREAMLDFLAGS!$LXDREAMLDFLAGS$ac_delim
    1.74 -BUILD_SHARED_TRUE!$BUILD_SHARED_TRUE$ac_delim
    1.75 -BUILD_SHARED_FALSE!$BUILD_SHARED_FALSE$ac_delim
    1.76 +BUILD_PLUGINS_TRUE!$BUILD_PLUGINS_TRUE$ac_delim
    1.77 +BUILD_PLUGINS_FALSE!$BUILD_PLUGINS_FALSE$ac_delim
    1.78  LXDREAMCPPFLAGS!$LXDREAMCPPFLAGS$ac_delim
    1.79  PKG_CONFIG!$PKG_CONFIG$ac_delim
    1.80  LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim