]>
Commit | Line | Data |
---|---|---|
e02e0ba8 AZ |
1 | --- postgresql-9.4.0/configure.in.orig 2015-01-05 23:55:32.000000000 +0100 |
2 | +++ postgresql-9.4.0/configure.in 2015-01-06 00:03:58.433386714 +0100 | |
3 | @@ -1166,13 +1166,13 @@ | |
4 | [AC_MSG_ERROR([header file <uuid.h> does not match E2FS UUID library])])], | |
5 | [AC_MSG_ERROR([header file <uuid/uuid.h> or <uuid.h> is required for E2FS UUID])])]) | |
6 | elif test "$with_uuid" = ossp ; then | |
7 | - AC_CHECK_HEADERS(ossp/uuid.h, | |
8 | - [AC_EGREP_HEADER([uuid_export], ossp/uuid.h, [], | |
9 | - [AC_MSG_ERROR([header file <ossp/uuid.h> does not match OSSP UUID library])])], | |
10 | + AC_CHECK_HEADERS(ossp-uuid/uuid.h, | |
11 | + [AC_EGREP_HEADER([uuid_export], ossp-uuid/uuid.h, [], | |
12 | + [AC_MSG_ERROR([header file <ossp-uuid/uuid.h> does not match OSSP UUID library])])], | |
13 | [AC_CHECK_HEADERS(uuid.h, | |
14 | [AC_EGREP_HEADER([uuid_export], uuid.h, [], | |
15 | [AC_MSG_ERROR([header file <uuid.h> does not match OSSP UUID library])])], | |
16 | - [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP UUID])])]) | |
17 | + [AC_MSG_ERROR([header file <ossp-uuid/uuid.h> or <uuid.h> is required for OSSP UUID])])]) | |
18 | fi | |
19 | ||
20 | if test "$PORTNAME" = "win32" ; then | |
7f05d1f9 AM |
21 | --- postgresql-9.4.1/contrib/uuid-ossp/uuid-ossp.c.org 2015-03-23 10:41:24.000000000 +0100 |
22 | +++ postgresql-9.4.1/contrib/uuid-ossp/uuid-ossp.c 2015-03-23 10:54:29.403373571 +0100 | |
23 | @@ -29,8 +29,8 @@ | |
24 | #ifdef HAVE_UUID_H | |
25 | #include <uuid.h> | |
26 | #endif | |
27 | -#ifdef HAVE_OSSP_UUID_H | |
28 | -#include <ossp/uuid.h> | |
29 | +#ifdef HAVE_OSSP_UUID_UUID_H | |
30 | +#include <ossp-uuid/uuid.h> | |
31 | #endif | |
32 | #ifdef HAVE_UUID_UUID_H | |
33 | #include <uuid/uuid.h> | |
34 |