|
 |
9b1d78 |
diff -up openchange-2.0-QUADRANT/configure.ac.OC_RULE_ADD-fix openchange-2.0-QUADRANT/configure.ac
|
|
|
9b1d78 |
--- openchange-2.0-QUADRANT/configure.ac.OC_RULE_ADD-fix 2013-02-14 10:55:32.037997680 +0100
|
|
|
9b1d78 |
+++ openchange-2.0-QUADRANT/configure.ac 2013-02-14 10:58:08.012868678 +0100
|
|
|
9b1d78 |
@@ -657,11 +657,20 @@ AC_SUBST(OC_MAPISTORE_CLEAN)
|
|
|
9b1d78 |
AC_SUBST(OC_MAPISTORE_INSTALL)
|
|
|
9b1d78 |
AC_SUBST(OC_MAPISTORE_UNINSTALL)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
+OC_SERVER=
|
|
|
9b1d78 |
+OC_SERVER_CLEAN=
|
|
|
9b1d78 |
+OC_SERVER_INSTALL=
|
|
|
9b1d78 |
+OC_SERVER_UNINSTALL=
|
|
|
9b1d78 |
+AC_SUBST(OC_SERVER)
|
|
|
9b1d78 |
+AC_SUBST(OC_SERVER_CLEAN)
|
|
|
9b1d78 |
+AC_SUBST(OC_SERVER_INSTALL)
|
|
|
9b1d78 |
+AC_SUBST(OC_SERVER_UNINSTALL)
|
|
|
9b1d78 |
+
|
|
|
9b1d78 |
dnl ##########################################################################
|
|
|
9b1d78 |
dnl mapiproxy server
|
|
|
9b1d78 |
dnl ##########################################################################
|
|
|
9b1d78 |
if test x$PYTHON != x; then
|
|
|
9b1d78 |
- if test "x$SAMBASERVER_LIBS" != x ; then
|
|
|
9b1d78 |
+ if test "x$SAMDB_LIBS" != x -a "x$SAMBASERVER_LIBS" != x ; then
|
|
|
9b1d78 |
mapiproxy=1
|
|
|
9b1d78 |
fi
|
|
|
9b1d78 |
fi
|
|
|
9b1d78 |
@@ -684,10 +693,16 @@ AC_ARG_ENABLE(pymapi, AC_HELP_STRING([--
|
|
|
9b1d78 |
PYCDIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='\\$(prefix)')"`
|
|
|
9b1d78 |
AC_SUBST(PYCDIR)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
-dnl Enable pyopenchange by default
|
|
|
9b1d78 |
-PYMAPIALL="$PYMAPIALL pyopenchange"
|
|
|
9b1d78 |
-PYMAPIINSTALL="$PYMAPIALLINSTALL pyopenchange-install"
|
|
|
9b1d78 |
-PYMAPIUNINSTALL="$PYMAPIUNINSTALL pyopenchange-uninstall"
|
|
|
9b1d78 |
+PYMAPIALL=
|
|
|
9b1d78 |
+PYMAPIINSTALL=
|
|
|
9b1d78 |
+PYMAPIUNINSTALL=
|
|
|
9b1d78 |
+
|
|
|
9b1d78 |
+if test x$enable_pymapi = xyes ; then
|
|
|
9b1d78 |
+ dnl Enable pyopenchange by default
|
|
|
9b1d78 |
+ PYMAPIALL="$PYMAPIALL pyopenchange"
|
|
|
9b1d78 |
+ PYMAPIINSTALL="$PYMAPIALLINSTALL pyopenchange-install"
|
|
|
9b1d78 |
+ PYMAPIUNINSTALL="$PYMAPIUNINSTALL pyopenchange-uninstall"
|
|
|
9b1d78 |
+fi
|
|
|
9b1d78 |
|
|
|
9b1d78 |
AC_SUBST(PYMAPIALL)
|
|
|
9b1d78 |
AC_SUBST(PYMAPIINSTALL)
|