[myserver-commit] [SCM] GNU MyServer branch, master, updated. 6e6ac19bb972dfbe05a4caf96c38aedc6df34fb9

[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  6e6ac19bb972dfbe05a4caf96c38aedc6df34fb9 (commit)
       via  08a6e59c15353641abd1852bbda8b81b24c5ed70 (commit)
       via  6dc817fcf7b8be6292eacb5f87777316d628b7b4 (commit)
      from  1826f042a7284e3eb05cc74d648ee452457a1306 (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 6e6ac19bb972dfbe05a4caf96c38aedc6df34fb9
Merge: 08a6e59 1826f04
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Aug 30 20:32:01 2009 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver




commit 08a6e59c15353641abd1852bbda8b81b24c5ed70
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Aug 30 20:31:19 2009 +0200

    Use position independent code (PIC) when it is possible.

diff --git a/myserver/configure.ac b/myserver/configure.ac
index c6a803a..4d83bd6 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -318,10 +318,12 @@ else
   MAKE_TESTS=no
 fi
 
-LDFLAGS="$LDFLAGS $LIBS"
+CFLAGS="$CFLAGS $pic_flag"
+CXXFLAGS="$CXXFLAGS $pic_flag"
+LDFLAGS="$LDFLAGS $LIBS $pic_flag"
 
 AC_SUBST(CFLAGS)
-AC_SUBST(CXFLAGS)
+AC_SUBST(CXXFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPUNIT_LDFLAGS)
 



commit 6dc817fcf7b8be6292eacb5f87777316d628b7b4
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Aug 30 20:30:55 2009 +0200

    Define a single macro when a regex library is present.

diff --git a/myserver/src/base/regex/myserver_regex.cpp 
b/myserver/src/base/regex/myserver_regex.cpp
index 575b49e..c7a45d1 100644
--- a/myserver/src/base/regex/myserver_regex.cpp
+++ b/myserver/src/base/regex/myserver_regex.cpp
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 3 of the License, or
@@ -17,16 +17,23 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 
 #include <include/base/regex/myserver_regex.h>
 
+#ifdef REGEX
+# define REGLIB 1
+#elif TRE
+# define REGLIB 1
+#else
+# undef REGLIB
+#endif
 /*!
  * Compile the regex pattern.
  */
-int Regex::compile(const char *p, int f)
+int Regex::compile (const char *p, int f)
 {
-#ifdef REGEX | TRE
-  int ret = regcomp(&compiledRegex, p, f);
-  pattern.assign(p);
+#ifdef REGLIB
+  int ret = regcomp (&compiledRegex, p, f);
+  pattern.assign (p);
   flags = f;
-  if(!ret)
+  if (!ret)
     compiled = 1;
   return ret;
 #endif
@@ -36,11 +43,11 @@ int Regex::compile(const char *p, int f)
 /*!
  * Match the pattern against strings.
  */
-int Regex::exec(const char *text, size_t nmatch, regmatch_t matchptr [],
-                int eflags)
+int Regex::exec (const char *text, size_t nmatch, regmatch_t matchptr [],
+                 int eflags)
 {
-#ifdef REGEX | TRE
-  if(!compiled)
+#ifdef REGLIB
+  if (!compiled)
     return 1;
   int ret = regexec (&compiledRegex, text, nmatch, matchptr, eflags);
   return ret;
@@ -51,11 +58,11 @@ int Regex::exec(const char *text, size_t nmatch, regmatch_t 
matchptr [],
 /*!
  * Free the used memory.
  */
-void Regex::free()
+void Regex::free ()
 {
-#ifdef REGEX | TRE
-  if(compiled)
-    regfree(&compiledRegex);
+#ifdef REGLIB
+  if (compiled)
+    regfree (&compiledRegex);
   compiled = 0;
 #endif
 }
@@ -63,26 +70,26 @@ void Regex::free()
 /*!
  * Destructor for the class
  */
-Regex::~Regex()
+Regex::~Regex ()
 {
-#ifdef REGEX | TRE
-  free();
+#ifdef REGLIB
+  free ();
 #endif
 }
 
 /*!
  * Constructor for the class.
  */
-Regex::Regex(const char *pattern, int flags)
+Regex::Regex (const char *pattern, int flags)
 {
-#ifdef REGEX | TRE
-  compile(pattern, flags);
+#ifdef REGLIB
+  compile (pattern, flags);
 #endif
 }
 /*!
  * Return a nonzero value if the regex was compiled.
  */
-int Regex::isCompiled()
+int Regex::isCompiled ()
 {
   return compiled;
 }
@@ -90,17 +97,17 @@ int Regex::isCompiled()
 /*!
  * Construct by copy.
  */
-Regex::Regex(Regex& r)
+Regex::Regex (Regex& r)
 {
-  clone(r);
+  clone (r);
 }
 
 /*!
  * Create a clone.
  */
-void Regex::clone(Regex& r)
+void Regex::clone (Regex& r)
 {
-#ifdef REGEX | TRE
-  compile(r.pattern.c_str(), r.flags);
+#ifdef REGLIB
+  compile (r.pattern.c_str (), r.flags);
 #endif
 }

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

Summary of changes:
 myserver/configure.ac                      |    6 ++-
 myserver/src/base/regex/myserver_regex.cpp |   59 +++++++++++++++------------
 2 files changed, 37 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
GNU MyServer