Bug 29518 – [Gtk] Use the SQLite3 headers from WebKitLibraries if sqlite3 is undetected

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Jan Alonzo]

If the system has no pkg-config for SQLite, use the SQLite3 headers from WebKitLibraries as a fallback. Patch forthcoming.

[Jan Alonzo]

Created attachment 39816 [details]
Patch v1

[Xan Lopez]

Comment on attachment 39816 [details]
Patch v1

>+   PKG_CHECK_MODULES([SQLITE3],
>+                     [sqlite3 >= $SQLITE_REQUIRED_VERSION],
>+                     [sqlite3_has_pkg_config=yes],
>+                     [sqlite3_has_pkg_config=no])
>+   if test "$sqlite3_has_pkg_config" = "no"; then
>+      AC_SEARCH_LIBS([sqlite3_open16], [sqlite3],
>+                     [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
>+                     [AC_MSG_ERROR([SQLite3 is required to enable Database support])])
>+   fi

Silly question, shouldn't you first try to use the headers that might come with the library you just found with AC_SEARCH_LIBS?
Or are you assuming that if there's no sqlite pkg-config file the only library you'll find is the one in WebKitLibraries?

>    AC_SUBST([SQLITE3_CFLAGS])
>    AC_SUBST([SQLITE3_LIBS])
> fi

[Eric Seidel (no email)]

Looks fine to me, although I'm not sure you really want to be depending on those headers.  Xan seems to have an objection though, so waiting for you to respond to that before marking r+.  Or rather, Xan can mark it r+ if he agrees.

[Holger Freyther]

Did we ever get a report that someone wanted to use sqlite3 but didn't have pkg-config files?

[Jan Alonzo]

(In reply to comment #2)
> (From update of attachment 39816 [details])
> >+   PKG_CHECK_MODULES([SQLITE3],
> >+                     [sqlite3 >= $SQLITE_REQUIRED_VERSION],
> >+                     [sqlite3_has_pkg_config=yes],
> >+                     [sqlite3_has_pkg_config=no])
> >+   if test "$sqlite3_has_pkg_config" = "no"; then
> >+      AC_SEARCH_LIBS([sqlite3_open16], [sqlite3],
> >+                     [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"],
> >+                     [AC_MSG_ERROR([SQLite3 is required to enable Database support])])
> >+   fi
> 
> Silly question, shouldn't you first try to use the headers that might come with
> the library you just found with AC_SEARCH_LIBS?
> Or are you assuming that if there's no sqlite pkg-config file the only library
> you'll find is the one in WebKitLibraries?

Yes. If there's no .pc file or there's no pkg-config binary, I'll just use what's in WebKitLibraries.

(In reply to comment #4)
> Did we ever get a report that someone wanted to use sqlite3 but didn't have
> pkg-config files?

Consider this a report.

[Jan Alonzo]

Landed as http://trac.webkit.org/changeset/49435.