Re: [Anarchdb-devel] v1.0

[Dams]

The patch is in the source rpm actually. :]
I'll attach it to this mail..

        D - :p

Le dim 06/06/2004 à 13:55, Francois Gombault a écrit :
> As for the sqlite detection, I'll try to see if I can fix it. My 
> autotools skills have improved a bit since last time.

-- 
         Dams Nadé
Anvil/Anvilou on irc.freenode.net : #Linux-Fr, #Fedora
"Dona Nobis Pacem E Dona Eis Requiem". Noir.

--- configure.in.orig   2004-06-05 22:06:26.497700595 +0200
+++ configure.in        2004-06-05 22:07:05.895988185 +0200
@@ -164,6 +164,10 @@
     ARDB_WX_LIBS="$WX_LIBS"
 fi
 
+PKG_CHECK_MODULES(SQLITE, sqlite)
+AC_SUBST(SQLITE_CFLAGS)
+AC_SUBST(SQLITE_LIBS)
+
 CXXFLAGS="$CXXFLAGS $DEBUG_FLAGS $WX_CXXFLAGS $XML2_FLAGS $XSLT_FLAGS 
\"-DARDB_PREFIX=\\\"$prefix\\\"\" "
 
 AC_SUBST(LDFLAGS)
--- src/Makefile.am.orig        2004-06-05 22:08:02.848715330 +0200
+++ src/Makefile.am     2004-06-05 22:09:28.643220985 +0200
@@ -2,12 +2,11 @@
 #SUBDIRS = resources
 
 RESCOMP = @RESCOMP@
-ARDB_SQLITE_LIBS = libsqlite.a
 ARDB_WX_LIBS = @ARDB_WX_LIBS@
 ARDB_XML2_LIBS = @XML2_LIBS@
 ARDB_XSLT_LIBS = @XSLT_LIBS@
 
-INCLUDES = -I$(top_srcdir)/../sqlite
+INCLUDES = $(SQLITE_CFLAGS)
 
 if USE_WINDOWS
 RESOURCE_FILES = ardb_resource.o
@@ -41,7 +40,4 @@
         --include-dir $(srcdir)/../resources @RC_WX_INCLUDES@ \
         --define __WIN32__ --define __WIN95__ --define __GNUWIN32__
 
-libsqlite.a:
-       cp $(top_srcdir)/../sqlite/.libs/libsqlite.a .
-
-ardb_LDADD = $(RESOURCE_FILES) $(ARDB_WX_LIBS) $(ARDB_SQLITE_LIBS) 
$(ARDB_XML2_LIBS) $(ARDB_XSLT_LIBS)
+ardb_LDADD = $(RESOURCE_FILES) $(ARDB_WX_LIBS) $(SQLITE_LIBS) 
$(ARDB_XML2_LIBS) $(ARDB_XSLT_LIBS)

signature.asc
Description: Ceci est une partie de message numériquement signée.