diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-11 05:36:13 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-05-11 05:36:13 +0000 |
commit | eac3a0a01bf37d95f4129b28296cb697c54b2613 (patch) | |
tree | a209bfa09edda04d8a339b869b4d5ce3057d8bbe /config.h.in | |
parent | 22c9029b44a790ba1ee894027431dcea1ec2aeab (diff) | |
download | cups-eac3a0a01bf37d95f4129b28296cb697c54b2613.tar.gz |
Merge changes from CUPS 1.5svn-r9763.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3242 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config.h.in')
-rw-r--r-- | config.h.in | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/config.h.in b/config.h.in index 0f047a474..5517c4407 100644 --- a/config.h.in +++ b/config.h.in @@ -186,6 +186,7 @@ #undef HAVE_STRINGS_H #undef HAVE_BSTRING_H + /* * Do we have the long long type? */ @@ -200,6 +201,7 @@ # define CUPS_LLCAST (long) #endif /* HAVE_LONG_LONG */ + /* * Do we have the strtoll() function? */ @@ -210,6 +212,7 @@ # define strtoll(nptr,endptr,base) strtol((nptr), (endptr), (base)) #endif /* !HAVE_STRTOLL */ + /* * Do we have the strXXX() functions? */ @@ -296,13 +299,14 @@ */ #undef HAVE_AUTHORIZATION_H +#undef HAVE_SECBASEPRIV_H #undef HAVE_SECCERTIFICATE_H +#undef HAVE_SECIDENTITYSEARCHPRIV_H #undef HAVE_SECITEM_H #undef HAVE_SECITEMPRIV_H #undef HAVE_SECPOLICY_H #undef HAVE_SECPOLICYPRIV_H -#undef HAVE_SECBASEPRIV_H -#undef HAVE_SECIDENTITYSEARCHPRIV_H +#undef HAVE_SECURETRANSPORTPRIV_H /* @@ -498,6 +502,7 @@ */ #undef HAVE_PDFTOPS +#undef HAVE_PDFTOPS_WITH_ORIGPAGESIZES #define CUPS_PDFTOPS "/usr/bin/pdftops" @@ -506,6 +511,7 @@ */ #undef HAVE_GHOSTSCRIPT +#undef HAVE_GHOSTSCRIPT_PS2WRITE #define CUPS_GHOSTSCRIPT "/usr/bin/gs" @@ -541,7 +547,7 @@ /* - * Do we have MacOSX 10.4's mbr_XXX functions? + * Do we have Mac OS X 10.4's mbr_XXX functions? */ #undef HAVE_MEMBERSHIP_H @@ -573,27 +579,19 @@ /* - * Do we have the AppleTalk/at_proto.h header? - */ - -#undef HAVE_APPLETALK_AT_PROTO_H - - -/* * Do we have the GSSAPI support library (for Kerberos support)? */ +#undef HAVE_GSS_ACQUIRE_CRED_EX_F +#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE +#undef HAVE_GSS_GSSAPI_H +#undef HAVE_GSS_GSSAPI_SPI_H #undef HAVE_GSSAPI -#undef HAVE_GSSAPI_H +#undef HAVE_GSSAPI_GENERIC_H #undef HAVE_GSSAPI_GSSAPI_H -#undef HAVE_GSSAPI_GSSAPI_GENERIC_H -#undef HAVE_GSSAPI_GSSAPI_KRB5_H -#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY -#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE -#undef HAVE_KRB5_CC_NEW_UNIQUE -#undef HAVE_KRB5_IPC_CLIENT_SET_TARGET_UID +#undef HAVE_GSSAPI_H +#undef HAVE_GSSAPI_KRB5_H #undef HAVE_KRB5_H -#undef HAVE_HEIMDAL /* @@ -724,6 +722,13 @@ #undef HAVE_COLORSYNCREGISTERDEVICE +/* + * Do we have XPC? + */ + +#undef HAVE_XPC + + #endif /* !_CUPS_CONFIG_H_ */ /* |