- add fixme-commentary about sqlite dependency
authorPanu Matilainen <pmatilai@turre.koti.laiskiainen.org>
Tue, 27 Feb 2007 19:36:12 +0000 (21:36 +0200)
committerPanu Matilainen <pmatilai@turre.koti.laiskiainen.org>
Tue, 27 Feb 2007 19:36:12 +0000 (21:36 +0200)
configure
configure.ac

index 2ddb4ab..1e08fbf 100755 (executable)
--- a/configure
+++ b/configure
@@ -21265,7 +21265,7 @@ else
   RPMDBLIBS="-ldb-3.1"
 fi
 
-      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt -lsqlite3"
+      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt"
    fi
    echo "$as_me:$LINENO: checking for RPM libraries" >&5
 echo $ECHO_N "checking for RPM libraries... $ECHO_C" >&6
@@ -21647,6 +21647,10 @@ echo "${ECHO_T}yes" >&6
 fi
   RPMLIBS="$LIBXML2_LIBS $RPMLIBS"
   CPPFLAGS="$LIBXML2_CFLAGS $CPPFLAGS"
+  ## FIXME: Conditionalize this properly. We can support xml repomd without
+  ## sqlite and repodb with libxml2 older than 2.6. In addition, rollback
+  ## will be using sqlite as well, we only want to check for it once.
+  RPMLIBS="$RPMLIBS -lsqlite3"
 else
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
index 02f8e17..ca0bd40 100644 (file)
@@ -85,7 +85,7 @@ else
          [RPMDBLIBS="-lrpmdb"],
          [RPMDBLIBS="-ldb-3.1"],
          [-lrpm -lrpmio -lz -lbz2 -lpopt])
-      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt -lsqlite3"
+      RPMLIBS="-lrpm $RPMDBLIBS -lrpmio -lz -lbz2 -lpopt"
    fi
    AC_MSG_CHECKING(for RPM libraries)
    AC_MSG_RESULT($RPMLIBS)
@@ -148,6 +148,10 @@ if test "$enable_repomd" != "no"; then
   PKG_CHECK_MODULES([LIBXML2],[libxml-2.0 >= 2.6])
   RPMLIBS="$LIBXML2_LIBS $RPMLIBS"
   CPPFLAGS="$LIBXML2_CFLAGS $CPPFLAGS"
+  ## FIXME: Conditionalize this properly. We can support xml repomd without 
+  ## sqlite and repodb with libxml2 older than 2.6. In addition, rollback
+  ## will be using sqlite as well, we only want to check for it once.
+  RPMLIBS="$RPMLIBS -lsqlite3"
 else
   AC_MSG_RESULT(yes)
 fi