[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-55-g6ac1124

[Giuseppe Scrivano]

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  6ac1124610bc2e0a3fae72e6d085d008adbdebd2 (commit)
       via  2389521166169f350abc7f57624428cc85f82168 (commit)
      from  2e5cce1fc0d883b89d271a4fcc57286d4db68783 (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 6ac1124610bc2e0a3fae72e6d085d008adbdebd2
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Feb 27 00:37:51 2010 +0100

    GUI installation honors `DESTDIR'

diff --git a/myserver/src/GUI/Makefile.am b/myserver/src/GUI/Makefile.am
index 0e6c32a..a26a902 100644
--- a/myserver/src/GUI/Makefile.am
+++ b/myserver/src/GUI/Makefile.am
@@ -27,5 +27,6 @@ endif
 
 install:
 if BUILD_GUI
-       python setup.py install --prefix=${prefix} --install-scripts=${bindir}
+       python setup.py install --prefix=${DESTDIR}${prefix} \
+                 --install-scripts=${DESTDIR}${bindir}
 endif



commit 2389521166169f350abc7f57624428cc85f82168
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Feb 26 23:44:28 2010 +0100

    Give a clearer error message

diff --git a/myserver/configure.ac b/myserver/configure.ac
index 8a1322c..e400a3a 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -155,7 +155,7 @@ AC_SUBST(XNET_LIB)
 
 AC_SEARCH_LIBS([event_add], [event event_core event_extra],,
                             [AC_MSG_ERROR([*** Cannot find libevent
-*** libevent is required for MyServer])])
+                            *** libevent is required for MyServer])])
 
 AC_CHECK_FUNCS(event_loopbreak,
         AC_DEFINE(EVENT_LOOPBREAK, 1,
@@ -193,8 +193,8 @@ dnl Looking for LibXL2
 AM_PATH_XML2(2.6.0, have_xml2=yes)
 if test x$have_xml2 != xyes; then
     AC_MSG_ERROR([
-*** Cannot find libXML2
-*** libXML2 is required for MyServer
+*** Cannot find libxml2
+*** libxml2 is required
 ])
 
 else
@@ -207,7 +207,7 @@ AC_CHECK_LIB(gnutls, main)
 AC_CHECK_LIB(gnutls-openssl, main)
 
 if test x$ac_cv_lib_gnutls_openssl_main != xyes; then
-   AC_MSG_ERROR(Cannot find ssl libraries)
+   AC_MSG_ERROR([Cannot find ssl libraries, gnutls is required])
 fi
 
 dnl Looking for zlib

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

Summary of changes:
 myserver/configure.ac        |    8 ++++----
 myserver/src/GUI/Makefile.am |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU MyServer