[myserver-commit] [SCM] GNU MyServer branch, master, updated. 7086ce0915862f91e837a5d88688c811e840c74b

[Marek Aaron Sapota]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  7086ce0915862f91e837a5d88688c811e840c74b (commit)
      from  28ef7dff416a2f18707674b8f38d48bfa8ff28be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 7086ce0915862f91e837a5d88688c811e840c74b
Author: Marek Aaron Sapota <address@hidden>
Date:   Mon Sep 7 19:47:28 2009 +0200

    Autoconf checking for required python modules.

diff --git a/myserver/configure.ac b/myserver/configure.ac
index 92ad10e..b5f863a 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -331,6 +331,30 @@ if test x$enable_gui == xyes; then
     MAKE_GUI=no
   else
     MAKE_GUI=yes
+    AM_PYTHON_MODULE(lxml, have_lxml=yes)
+    if test x$have_lxml != xyes; then
+      AC_MSG_WARN([
+        *** Cannon find lxml Python module (http://codespeak.net/lxml/)
+        *** GUI will not be built
+      ])
+      MAKE_GUI=no
+    fi
+    AM_PYTHON_MODULE(gtk, have_gtk=yes)
+    if test x$have_gtk != xyes; then
+      AC_MSG_WARN([
+        *** Cannon find PyGTK Python module (http://www.pygtk.org/)
+        *** GUI will not be built
+      ])
+      MAKE_GUI=no
+    fi
+    AM_PYTHON_MODULE(gobject, have_gobject=yes)
+    if test x$have_gobject != xyes; then
+      AC_MSG_WARN([
+        *** Cannon find PyGObject Python module (http://www.pygtk.org/)
+        *** GUI will not be built
+      ])
+      MAKE_GUI=no
+    fi
   fi
 else
   MAKE_GUI=no
diff --git a/myserver/m4/python_mod.m4 b/myserver/m4/python_mod.m4
new file mode 100644
index 0000000..e19eb35
--- /dev/null
+++ b/myserver/m4/python_mod.m4
@@ -0,0 +1,38 @@
+dnl GNU MyServer
+dnl
+dnl Copyright (C) 2009 Free Software Foundation, Inc.
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
+dnl
+dnl AM_PYTHON_MODULE(MODULE_NAME, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([AM_PYTHON_MODULE],
+[
+  module_name=$1
+
+  AC_MSG_CHECKING(for Python module: $module_name)
+  no_module=""
+  python_module=`/usr/bin/env python -c "import $module_name" &> /dev/null && 
echo "yes"`
+  if test "$python_module" = "" ; then
+    AC_MSG_RESULT(no)
+    no_module=yes
+  else
+    AC_MSG_RESULT(yes)
+  fi
+
+  if test "x$no_module" = x ; then
+    ifelse([$2], , :, [$2])
+  else
+    ifelse([$3], , :, [$3])
+  fi
+])

-----------------------------------------------------------------------

Summary of changes:
 myserver/configure.ac     |   24 ++++++++++++++++++++++++
 myserver/m4/python_mod.m4 |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100644 myserver/m4/python_mod.m4


hooks/post-receive
-- 
GNU MyServer