diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-10-11 13:31:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:25 -0500 |
| commit | 51994b35f14d3103fc4543a1bd4cfb3429fd5b5c (patch) | |
| tree | a32a469a5b8e1d2a0c61f43cf12b1d8196e0b1f7 /source3/lib | |
| parent | 06ea7f144ac092a659532e790e92fcd10ef3eeaa (diff) | |
| download | samba-51994b35f14d3103fc4543a1bd4cfb3429fd5b5c.tar.gz samba-51994b35f14d3103fc4543a1bd4cfb3429fd5b5c.tar.bz2 samba-51994b35f14d3103fc4543a1bd4cfb3429fd5b5c.zip | |
r19244: fix the build on systems with broken krb5
we need to make sure
HAVE_GSSAPI
HAVE_KRB5_H
HAVE_GSSAPI_H
HAVE_GSSAPI_GSSAPI_GENERIC_H
HAVE_GSSAPI_GSSAPI_H
are not in config.h
this adds 2 new macros to libreplace
AC_REMOVE_DEFINE(), AC_REMOVE_INCLUDE()
metze
(This used to be commit eb1f0b49cf0e84385a62f9dfcb2167fea2e8fd8b)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/replace/libreplace_macros.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/source3/lib/replace/libreplace_macros.m4 b/source3/lib/replace/libreplace_macros.m4 index 4a645ef81f..0669c10c2a 100644 --- a/source3/lib/replace/libreplace_macros.m4 +++ b/source3/lib/replace/libreplace_macros.m4 @@ -264,6 +264,24 @@ define(AC_ADD_INCLUDE, EOF ]) +dnl remove an #include +dnl AC_REMOVE_INCLUDE(VARIABLE) +define(AC_REMOVE_INCLUDE, +[ +grep -v '[#include] $1' confdefs.h >confdefs.h.tmp +cat confdefs.h.tmp > confdefs.h +rm confdefs.h.tmp +]) + +dnl remove an #define +dnl AC_REMOVE_DEFINE(VARIABLE) +define(AC_REMOVE_DEFINE, +[ +grep -v '[#define] $1 ' confdefs.h |grep -v '[#define] $1[$]'>confdefs.h.tmp +cat confdefs.h.tmp > confdefs.h +rm confdefs.h.tmp +]) + dnl AS_HELP_STRING is not available in autoconf 2.57, and AC_HELP_STRING is deprecated dnl in autoconf 2.59, so define AS_HELP_STRING to be AC_HELP_STRING unless it is already dnl defined. |