[gnome-db] [libgda]: patch aprove for commit (or refuse)
- From: Tomasz Kłoczko <kloczek rudy mif pg gda pl>
- To: Rodrigo Moya <rodrigo gnome-db org>
- Cc: GDA <gnome-db-list gnome org>
- Subject: [gnome-db] [libgda]: patch aprove for commit (or refuse)
- Date: Mon, 11 Oct 2004 10:39:37 +0200 (CEST)
Description inside attached patch.
kloczek
--
-----------------------------------------------------------
*Ludzie nie mają problemów, tylko sobie sami je stwarzają*
-----------------------------------------------------------
Tomasz Kłoczko, sys adm @zie.pg.gda.pl|*e-mail: kloczek rudy mif pg gda pl*
2004-10-10 Tomasz KĹ?oczko <kloczek pld org pl>
* configure.in: better looking PKG_CHECK_MODULES() output. Declare
in one common place required versions of other tools using
m4_define(). Fixed identation.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libgda/configure.in,v
retrieving revision 1.254
diff -u -r1.254 configure.in
--- configure.in 11 Oct 2004 08:22:48 -0000 1.254
+++ configure.in 11 Oct 2004 08:34:45 -0000
@@ -16,6 +16,11 @@
m4_undefine([minor])
m4_undefine([micro])
+dnl required versions of other tools.
+m4_define([req_ver_glib], [2.0.0])
+m4_define([req_ver_libxslt], [1.0.9])
+
+m4_undefine([]
#
# Making releases:
# - If interfaces have been changed or added, set GDA_CURRENT += 1 and GDA_AGE += 1, set GDA_REVISION to 0.
@@ -56,10 +61,10 @@
dnl ******************************
AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
if test x$SCROLLKEEPER_CONFIG = xno; then
- AC_MSG_WARN(Could not find scrollkeeper-config -- please install the scrollkeeper package)
+ AC_MSG_WARN(Could not find scrollkeeper-config -- please install the scrollkeeper package)
else
- SCROLLKEEPER_LOCALSTATE_DIR=`scrollkeeper-config --pkglocalstatedir`
- AC_SUBST(SCROLLKEEPER_LOCALSTATE_DIR)
+ SCROLLKEEPER_LOCALSTATE_DIR=`scrollkeeper-config --pkglocalstatedir`
+ AC_SUBST(SCROLLKEEPER_LOCALSTATE_DIR)
fi
AM_CONDITIONAL(HAVE_SCROLLKEEPER, test x$SCROLLKEEPER_CONFIG != xno)
@@ -77,7 +82,14 @@
dnl Checks for libraries
dnl ******************************
-PKG_CHECK_MODULES(LIBGDA, glib-2.0 >= 2.0.0 gobject-2.0 >= 2.0.0 gthread-2.0 >= 2.0.0 gmodule-2.0 >= 2.0.0 libxml-2.0 libxslt >= 1.0.9)
+PKG_CHECK_MODULES(LIBGDA, [
+ glib-2.0 >= req_ver_glib
+ gobject-2.0 >= req_ver_glib
+ gthread-2.0 >= req_ver_glib
+ gmodule-2.0 >= req_ver_glib
+ libxml-2.0
+ libxslt >= req_ver_libxslt
+])
AC_SUBST(LIBGDA_CFLAGS)
AC_SUBST(LIBGDA_LIBS)
@@ -88,9 +100,9 @@
AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
if test "x$with_html_dir" = "x" ; then
- HTML_DIR='${datadir}/gtk-doc/html'
+ HTML_DIR='${datadir}/gtk-doc/html'
else
- HTML_DIR=$with_html_dir
+ HTML_DIR=$with_html_dir
fi
AC_SUBST(HTML_DIR)
@@ -98,22 +110,22 @@
gtk_doc_min_version=1.0
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
- AC_MSG_RESULT(yes)
- GTKDOC=true
+ AC_MSG_RESULT(yes)
+ GTKDOC=true
else
- AC_MSG_RESULT(no)
- GTKDOC=false
+ AC_MSG_RESULT(no)
+ GTKDOC=false
fi
dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
if test x$enable_gtk_doc = xauto ; then
- if test x$GTKDOC = xtrue ; then
- enable_gtk_doc=yes
- else
- enable_gtk_doc=no
- fi
+ if test x$GTKDOC = xtrue ; then
+ enable_gtk_doc=yes
+ else
+ enable_gtk_doc=no
+ fi
fi
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]