diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-27 19:42:08 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-05-27 19:42:08 -0400 |
| commit | b8cc8f94730610c0189aa82dfec4ae6ce9b13e34 (patch) | |
| tree | af8422da1b3a204d63aa847a17458e16d4e0c49d /src | |
| parent | 616afee14d7e8d6690286aaf8a2a0a01168c378a (diff) | |
| download | postgresql-b8cc8f94730610c0189aa82dfec4ae6ce9b13e34.tar.gz postgresql-b8cc8f94730610c0189aa82dfec4ae6ce9b13e34.zip | |
Support BSD and e2fsprogs UUID libraries alongside OSSP UUID library.
Allow the contrib/uuid-ossp extension to be built atop any one of these
three popular UUID libraries. (The extension's name is now arguably a
misnomer, but we'll keep it the same so as not to cause unnecessary
compatibility issues for users.)
We would not normally consider a change like this post-beta1, but the issue
has been forced by our upgrade to autoconf 2.69, whose more rigorous header
checks are causing OSSP's header files to be rejected on some platforms.
It's been foreseen for some time that we'd have to move away from depending
on OSSP UUID due to lack of upstream maintenance, so this is a down payment
on that problem.
While at it, add some simple regression tests, in hopes of catching any
major incompatibilities between the three implementations.
Matteo Beccati, with some further hacking by me
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 5 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 4b31c0a85e6..14119a15115 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -163,11 +163,11 @@ with_perl = @with_perl@ with_python = @with_python@ with_tcl = @with_tcl@ with_openssl = @with_openssl@ -with_ossp_uuid = @with_ossp_uuid@ with_selinux = @with_selinux@ with_libxml = @with_libxml@ with_libxslt = @with_libxslt@ with_system_tzdata = @with_system_tzdata@ +with_uuid = @with_uuid@ with_zlib = @with_zlib@ enable_rpath = @enable_rpath@ enable_nls = @enable_nls@ @@ -240,7 +240,8 @@ DLLWRAP = @DLLWRAP@ LIBS = @LIBS@ LDAP_LIBS_FE = @LDAP_LIBS_FE@ LDAP_LIBS_BE = @LDAP_LIBS_BE@ -OSSP_UUID_LIBS = @OSSP_UUID_LIBS@ +UUID_LIBS = @UUID_LIBS@ +UUID_EXTRA_OBJS = @UUID_EXTRA_OBJS@ LD = @LD@ with_gnu_ld = @with_gnu_ld@ ld_R_works = @ld_R_works@ diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index db930f5bb0e..5ff9e412121 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -602,9 +602,21 @@ /* Define to 1 if you have the <utime.h> header file. */ #undef HAVE_UTIME_H +/* Define to 1 if you have BSD UUID support. */ +#undef HAVE_UUID_BSD + +/* Define to 1 if you have E2FS UUID support. */ +#undef HAVE_UUID_E2FS + /* Define to 1 if you have the <uuid.h> header file. */ #undef HAVE_UUID_H +/* Define to 1 if you have OSSP UUID support. */ +#undef HAVE_UUID_OSSP + +/* Define to 1 if you have the <uuid/uuid.h> header file. */ +#undef HAVE_UUID_UUID_H + /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF |