diff options
| author | Martin Baulig <baulig@suse.de> | 2000-09-30 14:47:31 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-09-30 14:47:31 +0000 |
| commit | 363633f64268e3e46b932158e6a5af346a85dad4 (patch) | |
| tree | 30adfe55dbb6be33c17947b85e0493df43f9ab80 /macros2/gnome-common.m4 | |
| parent | 74e080dac151c1c538d71621df48e715597ee6f5 (diff) | |
| download | shared-mime-info-363633f64268e3e46b932158e6a5af346a85dad4.tar.gz | |
Switch to pkg-config to check for GTK+ 2.0; Removed all
2000-09-30 Martin Baulig <baulig@suse.de>
* gnome-x-checks.m4: Switch to pkg-config to check for GTK+ 2.0;
Removed all `gnome_cv_passdown_x_*' variables and `USE_DEVGTK'.
* gnome-common.m4 (GNOME_COMMON_INIT): Added the always-false
INSIDE_GNOME_COMMON automake conditional.
(GNOME_GTKDOC_CHECK): New macro.
(GNOME_DEBUG_CHECK): New macro.
svn path=/trunk/; revision=1419
Diffstat (limited to 'macros2/gnome-common.m4')
| -rw-r--r-- | macros2/gnome-common.m4 | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4 index c0dda4d0..d229843a 100644 --- a/macros2/gnome-common.m4 +++ b/macros2/gnome-common.m4 @@ -1,6 +1,5 @@ # gnome-common.m4 # -# This only for packages that are not in the GNOME CVS tree. dnl GNOME_COMMON_INIT @@ -16,5 +15,37 @@ AC_DEFUN([GNOME_COMMON_INIT], AC_SUBST(GNOME_ACLOCAL_FLAGS) ACLOCAL="$ACLOCAL $GNOME_ACLOCAL_FLAGS" + + AM_CONDITIONAL(INSIDE_GNOME_DOCU, false) +]) + +AC_DEFUN([GNOME_GTKDOC_CHECK], +[ + AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) + AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC) + AC_SUBST(HAVE_GTK_DOC) + + 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 + fi + + dnl NOTE: We need to use a separate automake conditional for this + dnl to make this work with the tarballs. + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) ]) +AC_DEFUN([GNOME_DEBUG_CHECK], +[ + AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no) + + if test x$enable_debug = xyes ; then + AC_DEFINE(GNOME_ENABLE_DEBUG) + fi +]) |