Changeset 1771

Timestamp:

26/07/2007 23:05:56 (5 years ago)

Author:

chris

Message:

Work around the fact that we may have regex support without having
regex.h (e.g. from pcreposix.h/libpcreposix) and disabuse HAVE_REGEX_H,
define and use HAVE_REGEX_SUPPORT instead, thanks Gary!
(refs #3, merges [1677] [1678] [1679])

Location:

box/chris/merge

Files:

• configure.ac (modified) (2 diffs)
• docs/backup/win32_build_on_cygwin_using_mingw.txt (modified) (1 diff)
• lib/common/BoxConfig-MSVC.h (modified) (1 diff)
• lib/common/ExcludeList.cpp (modified) (9 diffs)
• lib/common/ExcludeList.h (modified) (2 diffs)

box/chris/merge/configure.ac

@@ -113 +113 @@
 if test "$have_regex_h" = "yes"; then
   AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if regex.h is available])
-  AC_SEARCH_LIBS([regcomp], ["pcreposix -lpcre"])
+else
+  AC_CHECK_HEADER([pcreposix.h], [have_pcreposix_h=yes])
+fi
+
+if test "$have_pcreposix_h" = "yes"; then
+  AC_SEARCH_LIBS([regcomp], ["pcreposix -lpcre"],,[have_pcreposix_h=no_regcomp])
+fi
+
+if test "$have_pcreposix_h" = "yes"; then
+  AC_DEFINE([HAVE_PCREPOSIX_H], [1], [Define to 1 if pcreposix.h is available])
+fi
+
+if test "$have_regex_h" = "yes" -o "$have_pcreposix_h" = "yes"; then
+  have_regex_support=yes
+  AC_DEFINE([HAVE_REGEX_SUPPORT], [1], [Define to 1 if regular expressions are supported])
+else
+  have_regex_support=no
 fi
 
@@ -275 +291 @@
 to the documentation for more information on each feature.
 
-Regular expressions: $have_regex_h
+Regular expressions: $have_regex_support
 Large files:         $have_large_file_support
 Berkeley DB:         $ax_path_bdb_ok

box/chris/merge/docs/backup/win32_build_on_cygwin_using_mingw.txt

@@ -36 +36 @@
         ./configure
         make winshared
-        cp .libs/pcreposix.dll /bin
-        cp .libs/pcreposix.dll.a /usr/i686-pc-mingw32/lib
-        cp pcreposix.h /usr/i686-pc-mingw32/include/regex.h
+        cp .libs/libpcre.a .libs/libpcreposix.a /usr/lib/mingw
+        cp pcreposix.h /usr/include/mingw
 
 Now unpack the Box Backup sources, enter the source directory,
 and configure like this:
 
-        export CXX="g++ -mno-cygwin"
-        export LD="g++ -mno-cygwin"
-        export CFLAGS="-mno-cygwin -mthreads"
-        export CXXFLAGS="-mno-cygwin -mthreads"
-        export LDFLAGS="-mno-cygwin -mthreads"
-        export LIBS="-lcrypto -lws2_32 -lgdi32"
-        (if you don't have a "configure" file, run "./bootstrap")
-        ./configure --target=i686-pc-mingw32
+        ./infrastructure/mingw/configure.sh
         make
 

box/chris/merge/lib/common/BoxConfig-MSVC.h

@@ -179 +179 @@
 /* #undef HAVE_REGEX_H */
 #define HAVE_PCREPOSIX_H 1
+#define HAVE_REGEX_SUPPORT 1
 
 /* Define to 1 if you have the `setproctitle' function. */

box/chris/merge/lib/common/ExcludeList.cpp

@@ -10 +10 @@
 #include "Box.h"
 
-#ifdef HAVE_PCREPOSIX_H
-        #include <pcreposix.h>
-        #define EXCLUDELIST_IMPLEMENTATION_REGEX_T_DEFINED
-#elif defined HAVE_REGEX_H
-        #include <regex.h>
+#ifdef HAVE_REGEX_SUPPORT
+        #ifdef HAVE_PCREPOSIX_H
+                #include <pcreposix.h>
+        #else
+                #include <regex.h>
+        #endif
         #define EXCLUDELIST_IMPLEMENTATION_REGEX_T_DEFINED
 #endif
@@ -50 +51 @@
 ExcludeList::~ExcludeList()
 {
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
         // free regex memory
         while(mRegex.size() > 0)
@@ -168 +169 @@
 void ExcludeList::AddRegexEntries(const std::string &rEntries)
 {
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
 
         // Split strings up
@@ -253 +254 @@
         
         // Check against regular expressions
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
         for(std::vector<regex_t *>::const_iterator i(mRegex.begin()); i != mRegex.end(); ++i)
         {
@@ -309 +310 @@
         mDefinite.clear();
 
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
         // free regex memory
         while(mRegex.size() > 0)
@@ -350 +351 @@
         //
         //
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
         rArchive.Read(iCount);
 
@@ -387 +388 @@
                 }
         }
-#endif // HAVE_REGEX_H
+#endif // HAVE_REGEX_SUPPORT
 
         //
@@ -442 +443 @@
         //
         //
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
         // don't even try to save compiled regular expressions,
         // use string copies instead.
@@ -455 +456 @@
                 rArchive.Write(*i);
         }
-#endif // HAVE_REGEX_H
+#endif // HAVE_REGEX_SUPPORT
 
         //

box/chris/merge/lib/common/ExcludeList.h

@@ -51 +51 @@
         unsigned int SizeOfDefiniteList() const {return mDefinite.size();}
         unsigned int SizeOfRegexList() const
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
                 {return mRegex.size();}
 #else
@@ -59 +59 @@
 private:
         std::set<std::string> mDefinite;
-#ifdef HAVE_REGEX_H
+#ifdef HAVE_REGEX_SUPPORT
         std::vector<regex_t *> mRegex;
         std::vector<std::string> mRegexStr;     // save original regular expression string-based source for Serialize