casa-mp-base

--- configure.orig

+++ configure

@@ -1900,6 +1900,35 @@ $as_echo "$ac_res" >&6; }

 } # ac_fn_c_check_header_compile

+# ac_fn_c_check_header_preproc LINENO HEADER VAR

+# ----------------------------------------------

+# Tests whether HEADER is present, setting the cache variable VAR accordingly.

+ac_fn_c_check_header_preproc ()

+{

+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

+$as_echo_n "checking for $2... " >&6; }

+if eval \${$3+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+#include <$2>

+_ACEOF

+if ac_fn_c_try_cpp "$LINENO"; then :

+  eval "$3=yes"

+else

+  eval "$3=no"

+fi

+rm -f conftest.err conftest.i conftest.$ac_ext

+fi

+eval ac_res=\$$3

+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

+$as_echo "$ac_res" >&6; }

+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

+

+} # ac_fn_c_check_header_preproc

+

 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES

 # ----------------------------------------------------

 # Tries to find if the field MEMBER exists in type AGGR, after including

@@ -9400,7 +9429,7 @@ fi

 if test "$with_ossp_uuid" = yes ; then

   for ac_header in ossp/uuid.h

 do :

-  ac_fn_c_check_header_mongrel "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "$ac_includes_default"

+  ac_fn_c_check_header_preproc "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h"

 if test "x$ac_cv_header_ossp_uuid_h" = xyes; then :

   cat >>confdefs.h <<_ACEOF

 #define HAVE_OSSP_UUID_H 1

@@ -9410,7 +9439,7 @@ else

     for ac_header in uuid.h

 do :

-  ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default"

+  ac_fn_c_check_header_preproc "$LINENO" "uuid.h" "ac_cv_header_uuid_h"

 if test "x$ac_cv_header_uuid_h" = xyes; then :

   cat >>confdefs.h <<_ACEOF

 #define HAVE_UUID_H 1

--- configure.in.orig

+++ configure.in

@@ -1078,7 +1078,7 @@ fi

 if test "$with_ossp_uuid" = yes ; then

   AC_CHECK_HEADERS(ossp/uuid.h, [], [

     AC_CHECK_HEADERS(uuid.h, [],

-      [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID])])])

+      [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID])], [-])], [-])

 fi

 if test "$PORTNAME" = "win32" ; then