luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the gtk-doc version check.

Browse Source 
* configure.in: Fix the gtk-doc version check.
This commit is contained in:
Matthias Clasen 2002-11-28 00:02:17 +00:00
parent 00a9d30b67
commit d2c266b3dd
8 changed files with 57 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2002-11-28 Matthias Clasen <maclas@gmx.de>
* configure.in: Fix the gtk-doc version check.
2002-11-27 Matthias Clasen <maclas@gmx.de> 2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses * glib/gmessages.h: Use G_LIKELY without surrounding parentheses

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
2002-11-28 Matthias Clasen <maclas@gmx.de>
* configure.in: Fix the gtk-doc version check.
2002-11-27 Matthias Clasen <maclas@gmx.de> 2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses * glib/gmessages.h: Use G_LIKELY without surrounding parentheses

4
ChangeLog.pre-2-12
View File

@ -1,3 +1,7 @@
2002-11-28 Matthias Clasen <maclas@gmx.de>
* configure.in: Fix the gtk-doc version check.
2002-11-27 Matthias Clasen <maclas@gmx.de> 2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses * glib/gmessages.h: Use G_LIKELY without surrounding parentheses

4
ChangeLog.pre-2-2
View File

@ -1,3 +1,7 @@
2002-11-28 Matthias Clasen <maclas@gmx.de>
* configure.in: Fix the gtk-doc version check.
2002-11-27 Matthias Clasen <maclas@gmx.de> 2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses * glib/gmessages.h: Use G_LIKELY without surrounding parentheses

4
ChangeLog.pre-2-4
View File

@ -1,3 +1,7 @@
2002-11-28 Matthias Clasen <maclas@gmx.de>
* configure.in: Fix the gtk-doc version check.
2002-11-27 Matthias Clasen <maclas@gmx.de> 2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses * glib/gmessages.h: Use G_LIKELY without surrounding parentheses

4
ChangeLog.pre-2-6
View File

@ -1,3 +1,7 @@
2002-11-28 Matthias Clasen <maclas@gmx.de>
* configure.in: Fix the gtk-doc version check.
2002-11-27 Matthias Clasen <maclas@gmx.de> 2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses * glib/gmessages.h: Use G_LIKELY without surrounding parentheses

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
2002-11-28 Matthias Clasen <maclas@gmx.de>
* configure.in: Fix the gtk-doc version check.
2002-11-27 Matthias Clasen <maclas@gmx.de> 2002-11-27 Matthias Clasen <maclas@gmx.de>
* glib/gmessages.h: Use G_LIKELY without surrounding parentheses * glib/gmessages.h: Use G_LIKELY without surrounding parentheses

39
configure.in
View File

@ -843,13 +843,16 @@ dnl ****************************************
dnl *** strlcpy/strlcat *** dnl *** strlcpy/strlcat ***
dnl **************************************** dnl ****************************************
# Check for strlcpy # Check for strlcpy
AC_MSG_CHECKING(for strlcpy/strlcat) AC_MSG_CHECKING(for OpenBSD strlcpy/strlcat)
AC_TRY_LINK([#include <stdlib.h> AC_TRY_RUN([
#include <string.h>], [ #include <string.h>
char *p = malloc(10); int main() {
(void) strlcpy(p, "hi", 10); char *p = malloc (10);
(void) strlcat(p, "bye", 10); (void) strlcpy (p, "hi", 10);
], glib_ok=yes, glib_ok=no) if (strlcat (p, "bye", 0) != 3)
exit (1);
return 0;
}], glib_ok=yes, glib_ok=no)
AC_MSG_RESULT($glib_ok) AC_MSG_RESULT($glib_ok)
if test "$glib_ok" = "yes"; then if test "$glib_ok" = "yes"; then
AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat]) AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat])
@ -1778,18 +1781,28 @@ AC_SUBST(HTML_DIR)
AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
gtk_doc_min_version=0.6 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
gtk_doc_min_version=0.10
if $GTKDOC ; then if $GTKDOC ; then
gtk_doc_version=`gtkdoc-mkdb --version` gtk_doc_version=`gtkdoc-mkdb --version`
AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version]) AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
if perl <<EOF ; then
exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) && IFS="${IFS= }"; gtk_save_IFS="$IFS"; IFS="."
("$gtk_doc_version" >= "$gtk_doc_min_version") ? 0 : 1); set $gtk_doc_version
EOF for min in $gtk_doc_min_version ; do
cur=$1; shift
if test -z $min ; then break; fi
if test -z $cur ; then GTKDOC=false; break; fi
if test $cur -gt $min ; then break ; fi
if test $cur -lt $min ; then GTKDOC=false; break ; fi
done
IFS="$gtk_save_IFS"
if $GTKDOC ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
GTKDOC=false
fi fi
fi fi