diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2012-06-13 07:36:50 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2012-06-13 07:36:50 +0000 |
| commit | 4da420e5d0b4d60e90a8d4fe79536afe16cae29b (patch) | |
| tree | e78c8c59c14b401be3fa0a205faadb1f916af288 /databases/evolution-data-server | |
| parent | 20c3040943388af5e2a3cda6745e0f495eb7970c (diff) | |
| download | ports-4da420e5d0b4d60e90a8d4fe79536afe16cae29b.tar.gz ports-4da420e5d0b4d60e90a8d4fe79536afe16cae29b.zip | |
Rev 1.13 did not fix the build with Heimdal 1.5.x because the
extra include files required by the updated <com_err.h> were
guarded by "#if HAVE_COM_ERR_H", which configure does not define
when compiling the test program. There was also an extra inclusion
of <com_err.h> inside the #if/#endif block. For some odd reason, a number
of the other include file tests in the configure script are written
with an extra #include, but it is harmless in those cases because the
#if conditions are not met.
Remove the #if test and the redundant include from the test program for
<com_err.h>. Make a similar fix to the test for <et/com_err.h>.
Reviewed by: mezz
Notes
Notes:
svn path=/head/; revision=299177
Diffstat (limited to 'databases/evolution-data-server')
| -rw-r--r-- | databases/evolution-data-server/files/patch-configure | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index c5ed89d7f470..8eef3904dfc3 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2012-05-19 23:39:42.000000000 -0500 -+++ configure 2012-05-19 23:42:47.000000000 -0500 +--- configure.orig 2010-11-14 22:59:14.000000000 -0800 ++++ configure 2012-06-12 08:40:11.000000000 -0700 @@ -14174,6 +14174,14 @@ $as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h @@ -15,21 +15,27 @@ *) os_win32='no' NO_UNDEFINED='' -@@ -16196,6 +16204,8 @@ +@@ -16195,9 +16203,8 @@ + fi - ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" " #if HAVE_ET_COM_ERR_H -+ #include <stdio.h> +- ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" " #if HAVE_ET_COM_ERR_H +- #include <com_err.h> +- #endif ++ ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" " #include <stdio.h> + #include <stdarg.h> - #include <com_err.h> - #endif -@@ -16208,6 +16218,8 @@ + " + if test "x$ac_cv_header_et_com_err_h" = x""yes; then : +@@ -16207,9 +16214,8 @@ + fi - ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" " #if HAVE_COM_ERR_H -+ #include <stdio.h> +- ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" " #if HAVE_COM_ERR_H +- #include <com_err.h> +- #endif ++ ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" " #include <stdio.h> + #include <stdarg.h> - #include <com_err.h> - #endif + " + if test "x$ac_cv_header_com_err_h" = x""yes; then : |