[kdbus] Do not set body message if signature field is empty

[platform/upstream/glib.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index ed90b97..cac7f21 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,6 +23,16 @@ doit(char * s, ...)
   if (r != 7)
     exit(1);
 
+  /* AIX 5.1 and Solaris seems to have a half-baked vsnprintf()
+     implementation. The above will return 7 but if you replace
+     the size of the buffer with 0, it borks! */
+  va_start(args, s);
+  r = vsnprintf(buffer, 0, s, args);
+  va_end(args);
+
+  if (r != 7)
+    exit(1);
+
   exit(0);
 }
 
@@ -66,6 +76,16 @@ doit()
   if (r != 7)
     exit(1);
 
+  r = snprintf(buffer, 0, "1234567");
+
+  if (r != 7)
+    exit(1);
+
+  r = snprintf(NULL, 0, "1234567");
+
+  if (r != 7)
+    exit(1);
+
   exit(0);
 }
 
@@ -118,7 +138,7 @@ fi
 
 # Checks the location of the XML Catalog
 # Usage:
-#   JH_PATH_XML_CATALOG
+#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # Defines XMLCATALOG and XML_CATALOG_FILE substitutions
 AC_DEFUN([JH_PATH_XML_CATALOG],
 [
@@ -127,20 +147,27 @@ AC_DEFUN([JH_PATH_XML_CATALOG],
               AC_HELP_STRING([--with-xml-catalog=CATALOG],
                              [path to xml catalog to use]),,
               [with_xml_catalog=/etc/xml/catalog])
+  jh_found_xmlcatalog=true
   XML_CATALOG_FILE="$with_xml_catalog"
+  AC_SUBST([XML_CATALOG_FILE])
   AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
   if test -f "$XML_CATALOG_FILE"; then
     AC_MSG_RESULT([found])
   else
+    jh_found_xmlcatalog=false
     AC_MSG_RESULT([not found])
-    AC_MSG_ERROR([XML catalog not found])
   fi
-  AC_SUBST([XML_CATALOG_FILE])
 
   # check for the xmlcatalog program
   AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
   if test "x$XMLCATALOG" = xno; then
-    AC_MSG_ERROR([could not find xmlcatalog program])
+    jh_found_xmlcatalog=false
+  fi
+
+  if $jh_found_xmlcatalog; then
+    ifelse([$1],,[:],[$1])
+  else
+    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
   fi
 ])
 
@@ -149,9 +176,10 @@ AC_DEFUN([JH_PATH_XML_CATALOG],
 #   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 AC_DEFUN([JH_CHECK_XML_CATALOG],
 [
-  AC_REQUIRE([JH_PATH_XML_CATALOG])dnl
+  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
-  if AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+  if $jh_found_xmlcatalog && \
+     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
     AC_MSG_RESULT([found])
     ifelse([$3],,,[$3
 ])dnl
@@ -418,3 +446,7 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
 ])
 
 
+m4_include(acglib.m4)dnl
+m4_include(glib/libcharset/codeset.m4)dnl
+m4_include(glib/libcharset/glibc21.m4)dnl
+m4_include(m4macros/glib-gettext.m4)dnl