File rasqal-0.9.16-mingw.patch of Package mingw32-rasqal

Overview Repositories Revisions Requests Users Attributes Meta

File rasqal-0.9.16-mingw.patch of Package mingw32-rasqal (Revision 76c2d95528febb7b2e928e8ca82f5173)

Currently displaying revision 76c2d95528febb7b2e928e8ca82f5173 , Show latest

--- rasqal-0.9.16/configure.ac	2008-06-30 08:13:52.000000000 +0200
+++ rasqal-0.9.16/configure.ac	2009-07-01 09:53:41.000000000 +0200
@@ -435,27 +435,33 @@
 fi
 
 
-AC_MSG_CHECKING(for posix regex library)
+REGEX_LIBS=
 oLIBS="$LIBS"
 if test $ac_cv_header_regex_h = yes; then
+  AC_CHECK_FUNCS(regcomp,,[AC_CHECK_LIB(regex,regcomp,
+                [LIBS="$LIBS -lregex"]
+                [REGEX_LIBS=-lregex],)])
+  AC_MSG_CHECKING(for posix regex library)
   AC_TRY_LINK([#include <sys/types.h>
               #include <regex.h>],
              [regex_t reg; char *pat="abc"; regcomp(&reg, pat, 0);],
              worked=yes, worked=no, worked=no)
   if test $worked = yes; then
+    AC_MSG_RESULT(yes)
     have_regex_posix=1
+  else
+    AC_MSG_RESULT(no)
   fi
 fi
 
 LIBS="$oLIBS"
 
 if test $have_regex_posix = 1; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_REGEX_PCRE, 1, [have PCRE regex - Perl Compatible Regular Expressions])
+  AC_DEFINE(HAVE_REGEX_POSIX, 1, [have posix regex])
 else
-  AC_MSG_RESULT(no)
+  REGEX_LIBS=
 fi
-
+AC_SUBST(REGEX_LIBS)
 
 
 AC_ARG_WITH(regex-library, [  --with-regex-library=NAME   Use regex library - posix, pcre (auto)], regex_library="$withval", regex_library="") 
--- rasqal-0.9.16/src/Makefile.am	2008-06-30 08:13:52.000000000 +0200
+++ rasqal-0.9.16/src/Makefile.am	2009-07-01 09:47:28.000000000 +0200
@@ -74,8 +74,8 @@
 if STRCASECMP
 librasqal_la_SOURCES += strcasecmp.c
 endif
-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
-librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
+librasqal_la_LDFLAGS = -no-undefined -version-info @RASQAL_LIBTOOL_VERSION@
+librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) $(REGEX_LIBS)
 librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
 
 
--- rasqal-0.9.16/src/win32_rasqal_config.h	2008-06-27 04:02:09.000000000 +0200
+++ rasqal-0.9.16/src/win32_rasqal_config.h	2009-07-01 09:36:10.000000000 +0200
@@ -32,6 +32,8 @@
 
 #define WIN32_LEAN_AND_MEAN 1
 
+#ifndef HAVE_CONFIG_H
+
 /* getopt is not in standard win32 C library - define if we have it */
 /* #define HAVE_GETOPT_H 1 */
 
@@ -54,6 +56,8 @@
 
 #define HAVE_C99_VSNPRINTF 1
 
+#endif /* HAVE_CONFIG_H */
+
 /* for access() which is POSIX but doesn't seem to have the defines in VC */
 #ifndef R_OK
 #define R_OK 4
@@ -62,6 +66,8 @@
 /* __func__ doesn't exist in Visual Studio 6 */
 #define __func__ ""
 
+#ifndef HAVE_CONFIG_H
+
 /* 
  * Defines that come from config.h
  */
@@ -81,6 +87,8 @@
 /* Version number of package */
 #define VERSION "0.9.16"
 
+#endif /* HAVE_CONFIG_H */
+
 #include <windows.h>
 #include <io.h>
 #include <memory.h>
@@ -95,6 +103,10 @@
 #undef ERROR
 #endif
 
+#ifdef DELETE
+#undef DELETE
+#endif
+
 /* flex: const is available */
 #define YY_USE_CONST
 /* looks like the .c files define this anyway */
@@ -103,6 +115,9 @@
 #undef RASQAL_INLINE
 #define RASQAL_INLINE __inline
 
+
+#ifndef HAVE_CONFIG_H
+
 /* Building RDQL query */
 #define RASQAL_QUERY_RDQL 1
 
@@ -118,6 +133,8 @@
 /* Use PCRE regex library */
 #define RASQAL_REGEX_PCRE 1
 
+#endif /* HAVE_CONFIG_H */
+
 #ifdef _DEBUG
 #define RASQAL_DEBUG 1
 #endif

Places

File rasqal-0.9.16-mingw.patch of Package mingw32-rasqal (Revision 76c2d95528febb7b2e928e8ca82f5173)

Places