Parcourir la source

2009-12-16 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Fixed the bug that if --without-sqlite3 is given, pkg-config is
	not properly used in configure script and failed to detect gnutls.
	This is because explicit call of PKG_PROG_PKG_CONFIG is missing
	and the initialization of pkg-config is done in first occurrence
	of PKG_CHECK_MODULES which is not executed because it is inside of
	sqlite3.m4. Added explicit PKG_PROG_PKG_CONFIG call.
	* configure.ac
Tatsuhiro Tsujikawa il y a 16 ans
Parent
commit
b19e292157
4 fichiers modifiés avec 325 ajouts et 275 suppressions
  1. 10 0
      ChangeLog
  2. 2 2
      aclocal.m4
  3. 310 273
      configure
  4. 3 0
      configure.ac

+ 10 - 0
ChangeLog

@@ -1,3 +1,13 @@
+2009-12-16  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Fixed the bug that if --without-sqlite3 is given, pkg-config is
+	not properly used in configure script and failed to detect gnutls.
+	This is because explicit call of PKG_PROG_PKG_CONFIG is missing
+	and the initialization of pkg-config is done in first occurrence
+	of PKG_CHECK_MODULES which is not executed because it is inside of
+	sqlite3.m4. Added explicit PKG_PROG_PKG_CONFIG call.
+	* configure.ac
+
 2009-12-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Release 1.7.2

+ 2 - 2
aclocal.m4

@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])

Fichier diff supprimé car celui-ci est trop grand
+ 310 - 273
configure


+ 3 - 0
configure.ac

@@ -51,6 +51,9 @@ AC_LANG([C++])
 # Enable system extensions
 AC_USE_SYSTEM_EXTENSIONS
 
+# Check pkg-config is available
+PKG_PROG_PKG_CONFIG([0.20])
+
 # Checks for libraries.
 if test "x$with_libxml2" = "xyes"; then
   AM_PATH_XML2([2.6.24], [have_libxml2=yes])

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff