|
 |
701b01 |
diff -up openchange-openchange-2.3-VULCAN/configure.ac.drop-python openchange-openchange-2.3-VULCAN/configure.ac
|
|
|
701b01 |
--- openchange-openchange-2.3-VULCAN/configure.ac.drop-python 2018-04-17 12:59:29.738652248 +0200
|
|
|
701b01 |
+++ openchange-openchange-2.3-VULCAN/configure.ac 2018-04-17 13:00:36.006651332 +0200
|
|
|
701b01 |
@@ -376,36 +376,42 @@ AC_SUBST(PIDL)
|
|
|
701b01 |
dnl ---------------------------------------------------------------------------
|
|
|
701b01 |
dnl Check for Python
|
|
|
701b01 |
dnl ---------------------------------------------------------------------------
|
|
|
701b01 |
+dnl
|
|
|
701b01 |
+dnl AC_PATH_PROG(PYTHON, python3)
|
|
|
701b01 |
+dnl if test x"$PYTHON" = x""; then
|
|
|
701b01 |
+dnl AC_MSG_WARN([No version of python3 was found!])
|
|
|
701b01 |
+dnl AC_MSG_ERROR([Please install python3])
|
|
|
701b01 |
+dnl fi
|
|
|
701b01 |
+dnl AC_SUBST(PYTHON)
|
|
|
701b01 |
+dnl
|
|
|
701b01 |
+dnl AC_PATH_PROG(PYTHON_CONFIG, python3-config)
|
|
|
701b01 |
+dnl if test x"$PYTHON_CONFIG" = x""; then
|
|
|
701b01 |
+dnl AC_MSG_WARN([No version of python3-config was found!])
|
|
|
701b01 |
+dnl AC_MSG_ERROR([Please install python3-dev 3.x])
|
|
|
701b01 |
+dnl fi
|
|
|
701b01 |
+dnl AC_SUBST(PYTHON_CONFIG)
|
|
|
701b01 |
+dnl
|
|
|
701b01 |
+dnl AC_MSG_CHECKING(python cflags)
|
|
|
701b01 |
+dnl PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
|
|
|
701b01 |
+dnl AC_MSG_RESULT($PYTHON_CFLAGS)
|
|
|
701b01 |
+dnl AC_SUBST(PYTHON_CFLAGS)
|
|
|
701b01 |
+dnl
|
|
|
701b01 |
+dnl AC_MSG_CHECKING(python libs)
|
|
|
701b01 |
+dnl PYTHON_LIBS=`$PYTHON_CONFIG --libs`
|
|
|
701b01 |
+dnl AC_MSG_RESULT($PYTHON_LIBS)
|
|
|
701b01 |
+dnl AC_SUBST(PYTHON_LIBS)
|
|
|
701b01 |
+dnl
|
|
|
701b01 |
+dnl AC_MSG_CHECKING(python library directory)
|
|
|
701b01 |
+dnl pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
|
|
|
701b01 |
+dnl AC_MSG_RESULT($pythondir)
|
|
|
701b01 |
+dnl AC_SUBST(pythondir)
|
|
|
701b01 |
|
|
|
701b01 |
-AC_PATH_PROG(PYTHON, python3)
|
|
|
701b01 |
-if test x"$PYTHON" = x""; then
|
|
|
701b01 |
- AC_MSG_WARN([No version of python3 was found!])
|
|
|
701b01 |
- AC_MSG_ERROR([Please install python3])
|
|
|
701b01 |
-fi
|
|
|
701b01 |
-AC_SUBST(PYTHON)
|
|
|
701b01 |
-
|
|
|
701b01 |
-AC_PATH_PROG(PYTHON_CONFIG, python3-config)
|
|
|
701b01 |
-if test x"$PYTHON_CONFIG" = x""; then
|
|
|
701b01 |
- AC_MSG_WARN([No version of python3-config was found!])
|
|
|
701b01 |
- AC_MSG_ERROR([Please install python3-dev 3.x])
|
|
|
701b01 |
-fi
|
|
|
701b01 |
-AC_SUBST(PYTHON_CONFIG)
|
|
|
701b01 |
-
|
|
|
701b01 |
-AC_MSG_CHECKING(python cflags)
|
|
|
701b01 |
-PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
|
|
|
701b01 |
-AC_MSG_RESULT($PYTHON_CFLAGS)
|
|
|
701b01 |
+PYTHON_CFLAGS=
|
|
|
701b01 |
AC_SUBST(PYTHON_CFLAGS)
|
|
|
701b01 |
|
|
|
701b01 |
-AC_MSG_CHECKING(python libs)
|
|
|
701b01 |
-PYTHON_LIBS=`$PYTHON_CONFIG --libs`
|
|
|
701b01 |
-AC_MSG_RESULT($PYTHON_LIBS)
|
|
|
701b01 |
+PYTHON_LIBS=
|
|
|
701b01 |
AC_SUBST(PYTHON_LIBS)
|
|
|
701b01 |
|
|
|
701b01 |
-AC_MSG_CHECKING(python library directory)
|
|
|
701b01 |
-pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
|
|
|
701b01 |
-AC_MSG_RESULT($pythondir)
|
|
|
701b01 |
-AC_SUBST(pythondir)
|
|
|
701b01 |
-
|
|
|
701b01 |
dnl ----------------------------------------------------------------------------
|
|
|
701b01 |
dnl Check for MYSQL client libraries
|
|
|
701b01 |
dnl ----------------------------------------------------------------------------
|
|
|
701b01 |
@@ -759,11 +765,11 @@ AC_SUBST(OC_SERVER_UNINSTALL)
|
|
|
701b01 |
dnl ##########################################################################
|
|
|
701b01 |
dnl mapiproxy server
|
|
|
701b01 |
dnl ##########################################################################
|
|
|
701b01 |
-if test x$PYTHON != x; then
|
|
|
701b01 |
- if test "x$SAMDB_LIBS" != x -a "x$SAMBASERVER_LIBS" != x ; then
|
|
|
701b01 |
- mapiproxy=1
|
|
|
701b01 |
- fi
|
|
|
701b01 |
-fi
|
|
|
701b01 |
+dnl if test x$PYTHON != x; then
|
|
|
701b01 |
+dnl if test "x$SAMDB_LIBS" != x -a "x$SAMBASERVER_LIBS" != x ; then
|
|
|
701b01 |
+dnl mapiproxy=1
|
|
|
701b01 |
+dnl fi
|
|
|
701b01 |
+dnl fi
|
|
|
701b01 |
OC_RULE_ADD(mapiproxy, SERVER)
|
|
|
701b01 |
|
|
|
701b01 |
AC_ARG_WITH(modulesdir,
|
|
|
701b01 |
@@ -780,14 +786,15 @@ AC_ARG_ENABLE(pyopenchange, AC_HELP_STRI
|
|
|
701b01 |
[build Python bindings for libmapi]),
|
|
|
701b01 |
enable_pyopenchange="$enableval",
|
|
|
701b01 |
enable_pyopenchange=no)
|
|
|
701b01 |
-PYCDIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='\\$(prefix)')"`
|
|
|
701b01 |
-AC_SUBST(PYCDIR)
|
|
|
701b01 |
|
|
|
701b01 |
PYOPENCHANGEALL=
|
|
|
701b01 |
PYOPENCHANGEINSTALL=
|
|
|
701b01 |
PYOPENCHANGEUNINSTALL=
|
|
|
701b01 |
|
|
|
701b01 |
if test x$enable_pyopenchange = xyes ; then
|
|
|
701b01 |
+ PYCDIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='\\$(prefix)')"`
|
|
|
701b01 |
+ AC_SUBST(PYCDIR)
|
|
|
701b01 |
+
|
|
|
701b01 |
dnl Enable pyopenchange by default
|
|
|
701b01 |
PYOPENCHANGEALL="$PYOPENCHANGEALL pyopenchange"
|
|
|
701b01 |
PYOPENCHANGEINSTALL="$PYOPENCHANGEALLINSTALL pyopenchange-install"
|