Hello list,
I'm proposing two patches in order to cover issues that I faced when
trying to build openchange lately.
I can push it but I wanted to have a feedback on them.
Matthieu.
>From f6827cde6bd524a3f425d521af9d0075b0e8013e Mon Sep 17 00:00:00 2001
From: Matthieu Patou <[email protected]>
Date: Wed, 14 Mar 2012 14:06:43 -0700
Subject: [PATCH 1/2] Create setup/mapistore if not existing
---
libmapi/conf/build.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libmapi/conf/build.sh b/libmapi/conf/build.sh
index d4f071d..2827035 100755
--- a/libmapi/conf/build.sh
+++ b/libmapi/conf/build.sh
@@ -3,4 +3,5 @@
./libmapi/conf/mparse.pl --parser=mapicodes --outputdir=libmapi/ libmapi/conf/mapi-codes
./libmapi/conf/mparse.pl --parser=codepage_lcid --outputdir=libmapi/ libmapi/conf/codepage-lcid
./libmapi/conf/mparse.pl --parser=mapistore_nameid --outputdir=mapiproxy/libmapistore/ libmapi/conf/mapi-named-properties
-./libmapi/conf/mparse.pl --parser=mapistore_namedprops --outputdir=setup/mapistore/ libmapi/conf/mapi-named-properties
\ No newline at end of file
+[ ! -d "setup/mapistore" ] && mkdir --parent "setup/mapistore"
+./libmapi/conf/mparse.pl --parser=mapistore_namedprops --outputdir=setup/mapistore/ libmapi/conf/mapi-named-properties
--
1.7.5.4
>From 6f36b246d7a8c29e474bc66666fd321142a1a89e Mon Sep 17 00:00:00 2001
From: Matthieu Patou <[email protected]>
Date: Wed, 14 Mar 2012 16:03:58 -0700
Subject: [PATCH 2/2] configure: do a better detection of python-config
---
configure.ac | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index f97ee00..a1be567 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,10 +302,15 @@ AC_SUBST(PIDL)
dnl ---------------------------------------------------------------------------
dnl Check for Python
dnl ---------------------------------------------------------------------------
-
-AC_PATH_PROG(PYTHON,python)
+AM_PATH_PYTHON
AC_PATH_PROG(PYTHON_CONFIG,python-config)
+if test x"$PYTHON_CONFIG" = "x" -a x"$PYTHON_VERSION" != "x"; then
+ pyconfig=`$PYTHON -c "import os; print 'python%s-config' % ('.'.join(\""$PYTHON_VERSION"\".split('.')[[:2]]))"`
+ AC_PATH_PROG(PYTHON_CONFIG,$pyconfig)
+fi
+
+
AC_MSG_CHECKING(python library directory)
pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
AC_MSG_RESULT($pythondir)
--
1.7.5.4
_______________________________________________
devel mailing list
[email protected]
http://mailman.openchange.org/listinfo/devel
