Add iOS target, config.h tweaks, and dest.c tweaks for builds.

diff --git a/cups/dest.c b/cups/dest.c
index f22e0965ccca2900776ab2e846c1c51b7a012e5c..17183ff33c1356f919d073a4529e89361322cda4 100644 (file)
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -48,7 +48,10 @@
  */
 
 #ifdef __APPLE__
-#  include <SystemConfiguration/SystemConfiguration.h>
+#  if !TARGET_OS_IOS
+#    include <SystemConfiguration/SystemConfiguration.h>
+#    define _CUPS_LOCATION_DEFAULTS 1
+#  endif /* !TARGET_OS_IOS */
 #  define kCUPSPrintingPrefs   CFSTR("org.cups.PrintingPrefs")
 #  define kDefaultPaperIDKey   CFSTR("DefaultPaperID")
 #  define kLastUsedPrintersKey CFSTR("LastUsedPrinters")
@@ -117,13 +120,17 @@ typedef struct _cups_dnssd_resolve_s      /* Data for resolving URI */
  * Local functions...
  */
 
-#ifdef __APPLE__
+#if _CUPS_LOCATION_DEFAULTS
 static CFArrayRef      appleCopyLocations(void);
 static CFStringRef     appleCopyNetwork(void);
+#endif /* _CUPS_LOCATION_DEFAULTS */
+#ifdef __APPLE__
 static char            *appleGetPaperSize(char *name, size_t namesize);
+#endif /* __APPLE__ */
+#if _CUPS_LOCATION_DEFAULTS
 static CFStringRef     appleGetPrinter(CFArrayRef locations,
                                        CFStringRef network, CFIndex *locindex);
-#endif /* __APPLE__ */
+#endif /* _CUPS_LOCATION_DEFAULTS */
 static cups_dest_t     *cups_add_dest(const char *name, const char *instance,
                                       int *num_dests, cups_dest_t **dests);
 #ifdef __BLOCKS__
@@ -307,6 +314,7 @@ _cupsAppleCopyDefaultPaperID(void)
 CFStringRef                            /* O - Default printer name */
 _cupsAppleCopyDefaultPrinter(void)
 {
+#  if _CUPS_LOCATION_DEFAULTS
   CFStringRef  network;                /* Network location */
   CFArrayRef   locations;              /* Location array */
   CFStringRef  locprinter;             /* Current printer */
@@ -363,6 +371,10 @@ _cupsAppleCopyDefaultPrinter(void)
   CFRelease(locations);
 
   return (locprinter);
+
+#  else
+  return (NULL);
+#  endif /* _CUPS_LOCATION_DEFAULTS */
 }
 
 
@@ -415,6 +427,7 @@ void
 _cupsAppleSetDefaultPrinter(
     CFStringRef name)                  /* I - Default printer/class name */
 {
+#  if _CUPS_LOCATION_DEFAULTS
   CFStringRef          network;        /* Current network */
   CFArrayRef           locations;      /* Old locations array */
   CFIndex              locindex;       /* Index in locations array */
@@ -508,6 +521,10 @@ _cupsAppleSetDefaultPrinter(
     CFRelease(locations);
 
   CFRelease(network);
+
+#  else
+  (void)name;
+#  endif /* _CUPS_LOCATION_DEFAULTS */
 }
 
 
@@ -2483,7 +2500,7 @@ _cupsUserDefault(char   *name,            /* I - Name buffer */
 }
 
 
-#ifdef __APPLE__
+#if _CUPS_LOCATION_DEFAULTS
 /*
  * 'appleCopyLocations()' - Copy the location history array.
  */
@@ -2576,8 +2593,10 @@ appleCopyNetwork(void)
 
   return (network);
 }
+#endif /* _CUPS_LOCATION_DEFAULTS */
 
 
+#ifdef __APPLE__
 /*
  * 'appleGetPaperSize()' - Get the default paper size.
  */
@@ -2603,8 +2622,10 @@ appleGetPaperSize(char   *name,          /* I - Paper size name buffer */
 
   return (name);
 }
+#endif /* __APPLE__ */
 
 
+#if _CUPS_LOCATION_DEFAULTS
 /*
  * 'appleGetPrinter()' - Get a printer from the history array.
  */
@@ -2642,7 +2663,7 @@ appleGetPrinter(CFArrayRef  locations,    /* I - Location array */
 
   return (NULL);
 }
-#endif /* __APPLE__ */
+#endif /* _CUPS_LOCATION_DEFAULTS */
 
 
 /*

diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index f7a0a92f394f9c325fb2667d97623c79caa3a987..7366535f5d75063c37dc84abcb0a3d80504d026c 100644 (file)
--- a/xcode/CUPS.xcodeproj/project.pbxproj
+++ b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -70,6 +70,73 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+               270696001CADF3E200FFE5FB /* array.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EB81333056300FCA411 /* array.c */; };
+               270696021CADF3E200FFE5FB /* auth.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EBB1333056300FCA411 /* auth.c */; };
+               270696071CADF3E200FFE5FB /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED1133305BB00FCA411 /* debug.c */; };
+               270696081CADF3E200FFE5FB /* dest.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED2133305BB00FCA411 /* dest.c */; };
+               270696091CADF3E200FFE5FB /* dir.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED3133305BB00FCA411 /* dir.c */; };
+               2706960B1CADF3E200FFE5FB /* encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED6133305BB00FCA411 /* encode.c */; };
+               2706960C1CADF3E200FFE5FB /* file.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED8133305BB00FCA411 /* file.c */; };
+               2706960F1CADF3E200FFE5FB /* getputfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EDC133305BB00FCA411 /* getputfile.c */; };
+               270696101CADF3E200FFE5FB /* globals.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EDD133305BB00FCA411 /* globals.c */; };
+               270696111CADF3E200FFE5FB /* http-addr.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EDE133305BB00FCA411 /* http-addr.c */; };
+               270696121CADF3E200FFE5FB /* http-addrlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EDF133305BB00FCA411 /* http-addrlist.c */; };
+               270696131CADF3E200FFE5FB /* http-support.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EE1133305BB00FCA411 /* http-support.c */; };
+               270696141CADF3E200FFE5FB /* http.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EE2133305BB00FCA411 /* http.c */; };
+               270696161CADF3E200FFE5FB /* dest-options.c in Sources */ = {isa = PBXBuildFile; fileRef = 72CF95E218A13543000FCAE4 /* dest-options.c */; };
+               270696171CADF3E200FFE5FB /* ipp-support.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EE5133305BB00FCA411 /* ipp-support.c */; };
+               270696181CADF3E200FFE5FB /* ipp.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EE6133305BB00FCA411 /* ipp.c */; };
+               270696191CADF3E200FFE5FB /* langprintf.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EE8133305BB00FCA411 /* langprintf.c */; };
+               2706961A1CADF3E200FFE5FB /* language.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EEA133305BB00FCA411 /* language.c */; };
+               2706961D1CADF3E200FFE5FB /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EEF133305BB00FCA411 /* md5.c */; };
+               2706961E1CADF3E200FFE5FB /* md5passwd.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EF0133305BB00FCA411 /* md5passwd.c */; };
+               2706961F1CADF3E200FFE5FB /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 7284F9EF1BFCCD940026F886 /* hash.c */; };
+               270696201CADF3E200FFE5FB /* notify.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EF1133305BB00FCA411 /* notify.c */; };
+               270696211CADF3E200FFE5FB /* options.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EF2133305BB00FCA411 /* options.c */; };
+               270696221CADF3E200FFE5FB /* tls.c in Sources */ = {isa = PBXBuildFile; fileRef = 727AD5B619100A58009F6862 /* tls.c */; };
+               270696251CADF3E200FFE5FB /* dest-job.c in Sources */ = {isa = PBXBuildFile; fileRef = 72CF95E018A13543000FCAE4 /* dest-job.c */; };
+               270696271CADF3E200FFE5FB /* pwg-media.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EF8133305BB00FCA411 /* pwg-media.c */; };
+               270696281CADF3E200FFE5FB /* dest-localization.c in Sources */ = {isa = PBXBuildFile; fileRef = 72CF95E118A13543000FCAE4 /* dest-localization.c */; };
+               270696291CADF3E200FFE5FB /* request.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EFB133305BB00FCA411 /* request.c */; };
+               2706962C1CADF3E200FFE5FB /* snprintf.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F00133305BB00FCA411 /* snprintf.c */; };
+               2706962D1CADF3E200FFE5FB /* string.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F02133305BB00FCA411 /* string.c */; };
+               2706962E1CADF3E200FFE5FB /* tempfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F03133305BB00FCA411 /* tempfile.c */; };
+               2706962F1CADF3E200FFE5FB /* thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F05133305BB00FCA411 /* thread.c */; };
+               270696301CADF3E200FFE5FB /* transcode.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F06133305BB00FCA411 /* transcode.c */; };
+               270696311CADF3E200FFE5FB /* usersys.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F08133305BB00FCA411 /* usersys.c */; };
+               270696341CADF3E200FFE5FB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E8136B64B000836530 /* SystemConfiguration.framework */; };
+               270696351CADF3E200FFE5FB /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E5136B64AF00836530 /* CoreFoundation.framework */; };
+               270696381CADF3E200FFE5FB /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 728FB7EF1536167A005426E1 /* libiconv.dylib */; };
+               270696391CADF3E200FFE5FB /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 728FB7F01536167A005426E1 /* libresolv.dylib */; };
+               2706963A1CADF3E200FFE5FB /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 728FB7EC1536161C005426E1 /* libz.dylib */; };
+               2706963B1CADF3E200FFE5FB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E7136B64B000836530 /* Security.framework */; };
+               2706963D1CADF3E200FFE5FB /* adminutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EB71333056300FCA411 /* adminutil.h */; settings = {ATTRIBUTES = (); }; };
+               2706963E1CADF3E200FFE5FB /* array.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EB91333056300FCA411 /* array.h */; settings = {ATTRIBUTES = (); }; };
+               2706963F1CADF3E200FFE5FB /* backend.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EBE1333056300FCA411 /* backend.h */; settings = {ATTRIBUTES = (); }; };
+               270696401CADF3E200FFE5FB /* cups-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC01333056300FCA411 /* cups-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696411CADF3E200FFE5FB /* debug-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC31333056300FCA411 /* debug-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696421CADF3E200FFE5FB /* file-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220ED7133305BB00FCA411 /* file-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696431CADF3E200FFE5FB /* http-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE0133305BB00FCA411 /* http-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696441CADF3E200FFE5FB /* ipp-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE4133305BB00FCA411 /* ipp-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696451CADF3E200FFE5FB /* language-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE9133305BB00FCA411 /* language-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696461CADF3E200FFE5FB /* md5-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEE133305BB00FCA411 /* md5-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696471CADF3E200FFE5FB /* ppd-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EF5133305BB00FCA411 /* ppd-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696481CADF3E200FFE5FB /* pwg-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EF9133305BB00FCA411 /* pwg-private.h */; settings = {ATTRIBUTES = (); }; };
+               270696491CADF3E200FFE5FB /* snmp-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EFE133305BB00FCA411 /* snmp-private.h */; settings = {ATTRIBUTES = (); }; };
+               2706964A1CADF3E200FFE5FB /* string-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F01133305BB00FCA411 /* string-private.h */; settings = {ATTRIBUTES = (); }; };
+               2706964B1CADF3E200FFE5FB /* thread-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F04133305BB00FCA411 /* thread-private.h */; settings = {ATTRIBUTES = (); }; };
+               2706964C1CADF3E200FFE5FB /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F471333063D00FCA411 /* config.h */; settings = {ATTRIBUTES = (); }; };
+               2706964D1CADF3E200FFE5FB /* cups.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC11333056300FCA411 /* cups.h */; settings = {ATTRIBUTES = (); }; };
+               2706964E1CADF3E200FFE5FB /* dir.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220ED4133305BB00FCA411 /* dir.h */; settings = {ATTRIBUTES = (); }; };
+               2706964F1CADF3E200FFE5FB /* file.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220ED9133305BB00FCA411 /* file.h */; settings = {ATTRIBUTES = (); }; };
+               270696501CADF3E200FFE5FB /* http.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE3133305BB00FCA411 /* http.h */; settings = {ATTRIBUTES = (); }; };
+               270696511CADF3E200FFE5FB /* ipp.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE7133305BB00FCA411 /* ipp.h */; settings = {ATTRIBUTES = (); }; };
+               270696521CADF3E200FFE5FB /* language.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEB133305BB00FCA411 /* language.h */; settings = {ATTRIBUTES = (); }; };
+               270696531CADF3E200FFE5FB /* ppd.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EF7133305BB00FCA411 /* ppd.h */; settings = {ATTRIBUTES = (); }; };
+               270696541CADF3E200FFE5FB /* sidechannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EFD133305BB00FCA411 /* sidechannel.h */; settings = {ATTRIBUTES = (); }; };
+               270696551CADF3E200FFE5FB /* transcode.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F07133305BB00FCA411 /* transcode.h */; settings = {ATTRIBUTES = (); }; };
+               270696561CADF3E200FFE5FB /* versioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F0A133305BB00FCA411 /* versioning.h */; settings = {ATTRIBUTES = (); }; };
+               2706965B1CAE1A9A00FFE5FB /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220F09133305BB00FCA411 /* util.c */; };
                270CCDBA135E3D0900007BE2 /* libcupsmime.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220FAC13330B2200FCA411 /* libcupsmime.dylib */; };
                270CCDBC135E3D3E00007BE2 /* testmime.c in Sources */ = {isa = PBXBuildFile; fileRef = 270CCDBB135E3D3E00007BE2 /* testmime.c */; };
                273BF6C71333B5370022CAAB /* testcups.c in Sources */ = {isa = PBXBuildFile; fileRef = 273BF6C61333B5370022CAAB /* testcups.c */; };
@@ -1311,6 +1378,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+               2706965A1CADF3E200FFE5FB /* libcups_ios.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libcups_ios.a; sourceTree = BUILT_PRODUCTS_DIR; };
                270B267D17F5C06700C8A3A9 /* tls-darwin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "tls-darwin.c"; path = "../cups/tls-darwin.c"; sourceTree = "<group>"; };
                270B267E17F5C06700C8A3A9 /* tls-gnutls.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "tls-gnutls.c"; path = "../cups/tls-gnutls.c"; sourceTree = "<group>"; };
                270B268117F5C5D600C8A3A9 /* tls-sspi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "tls-sspi.c"; path = "../cups/tls-sspi.c"; sourceTree = "<group>"; };
@@ -1686,6 +1754,19 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+               270696331CADF3E200FFE5FB /* Frameworks */ = {
+                       isa = PBXFrameworksBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               270696341CADF3E200FFE5FB /* SystemConfiguration.framework in Frameworks */,
+                               270696351CADF3E200FFE5FB /* CoreFoundation.framework in Frameworks */,
+                               270696381CADF3E200FFE5FB /* libiconv.dylib in Frameworks */,
+                               270696391CADF3E200FFE5FB /* libresolv.dylib in Frameworks */,
+                               2706963A1CADF3E200FFE5FB /* libz.dylib in Frameworks */,
+                               2706963B1CADF3E200FFE5FB /* Security.framework in Frameworks */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                270CCDA4135E3C9E00007BE2 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
@@ -2195,6 +2276,7 @@
                                274EE26B1A03EDCA003213D1 /* ippserver copy */,
                                274EE27C1A03EDCB003213D1 /* ippserver copy copy */,
                                27A0347B1A8BDB1300650675 /* lpadmin */,
+                               2706965A1CADF3E200FFE5FB /* libcups_ios.a */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -2593,6 +2675,39 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
+               2706963C1CADF3E200FFE5FB /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               2706963D1CADF3E200FFE5FB /* adminutil.h in Headers */,
+                               2706963E1CADF3E200FFE5FB /* array.h in Headers */,
+                               2706963F1CADF3E200FFE5FB /* backend.h in Headers */,
+                               270696401CADF3E200FFE5FB /* cups-private.h in Headers */,
+                               270696411CADF3E200FFE5FB /* debug-private.h in Headers */,
+                               270696421CADF3E200FFE5FB /* file-private.h in Headers */,
+                               270696431CADF3E200FFE5FB /* http-private.h in Headers */,
+                               270696441CADF3E200FFE5FB /* ipp-private.h in Headers */,
+                               270696451CADF3E200FFE5FB /* language-private.h in Headers */,
+                               270696461CADF3E200FFE5FB /* md5-private.h in Headers */,
+                               270696471CADF3E200FFE5FB /* ppd-private.h in Headers */,
+                               270696481CADF3E200FFE5FB /* pwg-private.h in Headers */,
+                               270696491CADF3E200FFE5FB /* snmp-private.h in Headers */,
+                               2706964A1CADF3E200FFE5FB /* string-private.h in Headers */,
+                               2706964B1CADF3E200FFE5FB /* thread-private.h in Headers */,
+                               2706964C1CADF3E200FFE5FB /* config.h in Headers */,
+                               2706964D1CADF3E200FFE5FB /* cups.h in Headers */,
+                               2706964E1CADF3E200FFE5FB /* dir.h in Headers */,
+                               2706964F1CADF3E200FFE5FB /* file.h in Headers */,
+                               270696501CADF3E200FFE5FB /* http.h in Headers */,
+                               270696511CADF3E200FFE5FB /* ipp.h in Headers */,
+                               270696521CADF3E200FFE5FB /* language.h in Headers */,
+                               270696531CADF3E200FFE5FB /* ppd.h in Headers */,
+                               270696541CADF3E200FFE5FB /* sidechannel.h in Headers */,
+                               270696551CADF3E200FFE5FB /* transcode.h in Headers */,
+                               270696561CADF3E200FFE5FB /* versioning.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                274FF5EC133330C800317ECB /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
@@ -2689,6 +2804,23 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
+               270695FD1CADF3E200FFE5FB /* libcups_ios */ = {
+                       isa = PBXNativeTarget;
+                       buildConfigurationList = 270696571CADF3E200FFE5FB /* Build configuration list for PBXNativeTarget "libcups_ios" */;
+                       buildPhases = (
+                               270695FE1CADF3E200FFE5FB /* Sources */,
+                               270696331CADF3E200FFE5FB /* Frameworks */,
+                               2706963C1CADF3E200FFE5FB /* Headers */,
+                       );
+                       buildRules = (
+                       );
+                       dependencies = (
+                       );
+                       name = libcups_ios;
+                       productName = libcups;
+                       productReference = 2706965A1CADF3E200FFE5FB /* libcups_ios.a */;
+                       productType = "com.apple.product-type.library.dynamic";
+               };
                270CCDA6135E3C9E00007BE2 /* testmime */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = 270CCDAF135E3C9E00007BE2 /* Build configuration list for PBXNativeTarget "testmime" */;
@@ -3354,6 +3486,9 @@
                                LastUpgradeCheck = 0730;
                                ORGANIZATIONNAME = "Apple Inc.";
                                TargetAttributes = {
+                                       270695FD1CADF3E200FFE5FB = {
+                                               DevelopmentTeam = RU58A2256H;
+                                       };
                                        27A0347A1A8BDB1200650675 = {
                                                CreatedOnToolsVersion = 6.1.1;
                                        };
@@ -3374,6 +3509,7 @@
                                274FF5DE13332D3000317ECB /* All */,
                                273BF6D91333B6260022CAAB /* Tests */,
                                72220EAD1333047D00FCA411 /* libcups */,
+                               270695FD1CADF3E200FFE5FB /* libcups_ios */,
                                274FF6891333B1C400317ECB /* libcups_static */,
                                72F75A601336F9A3004BB496 /* libcupsimage */,
                                72220FAB13330B2200FCA411 /* libcupsmime */,
@@ -3414,6 +3550,48 @@
 /* End PBXProject section */
 
 /* Begin PBXSourcesBuildPhase section */
+               270695FE1CADF3E200FFE5FB /* Sources */ = {
+                       isa = PBXSourcesBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               270696001CADF3E200FFE5FB /* array.c in Sources */,
+                               270696021CADF3E200FFE5FB /* auth.c in Sources */,
+                               270696071CADF3E200FFE5FB /* debug.c in Sources */,
+                               270696081CADF3E200FFE5FB /* dest.c in Sources */,
+                               270696091CADF3E200FFE5FB /* dir.c in Sources */,
+                               2706960B1CADF3E200FFE5FB /* encode.c in Sources */,
+                               2706960C1CADF3E200FFE5FB /* file.c in Sources */,
+                               2706960F1CADF3E200FFE5FB /* getputfile.c in Sources */,
+                               270696101CADF3E200FFE5FB /* globals.c in Sources */,
+                               270696111CADF3E200FFE5FB /* http-addr.c in Sources */,
+                               270696121CADF3E200FFE5FB /* http-addrlist.c in Sources */,
+                               270696131CADF3E200FFE5FB /* http-support.c in Sources */,
+                               270696141CADF3E200FFE5FB /* http.c in Sources */,
+                               270696161CADF3E200FFE5FB /* dest-options.c in Sources */,
+                               270696171CADF3E200FFE5FB /* ipp-support.c in Sources */,
+                               270696181CADF3E200FFE5FB /* ipp.c in Sources */,
+                               270696191CADF3E200FFE5FB /* langprintf.c in Sources */,
+                               2706961A1CADF3E200FFE5FB /* language.c in Sources */,
+                               2706961D1CADF3E200FFE5FB /* md5.c in Sources */,
+                               2706961E1CADF3E200FFE5FB /* md5passwd.c in Sources */,
+                               2706961F1CADF3E200FFE5FB /* hash.c in Sources */,
+                               270696201CADF3E200FFE5FB /* notify.c in Sources */,
+                               270696211CADF3E200FFE5FB /* options.c in Sources */,
+                               270696221CADF3E200FFE5FB /* tls.c in Sources */,
+                               270696251CADF3E200FFE5FB /* dest-job.c in Sources */,
+                               270696271CADF3E200FFE5FB /* pwg-media.c in Sources */,
+                               270696281CADF3E200FFE5FB /* dest-localization.c in Sources */,
+                               270696291CADF3E200FFE5FB /* request.c in Sources */,
+                               2706962C1CADF3E200FFE5FB /* snprintf.c in Sources */,
+                               2706962D1CADF3E200FFE5FB /* string.c in Sources */,
+                               2706965B1CAE1A9A00FFE5FB /* util.c in Sources */,
+                               2706962E1CADF3E200FFE5FB /* tempfile.c in Sources */,
+                               2706962F1CADF3E200FFE5FB /* thread.c in Sources */,
+                               270696301CADF3E200FFE5FB /* transcode.c in Sources */,
+                               270696311CADF3E200FFE5FB /* usersys.c in Sources */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                270CCDA3135E3C9E00007BE2 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
@@ -4289,6 +4467,44 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
+               270696581CADF3E200FFE5FB /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_IDENTITY = "iPhone Developer";
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+                               COMBINE_HIDPI_IMAGES = YES;
+                               EXECUTABLE_EXTENSION = a;
+                               EXECUTABLE_PREFIX = "";
+                               PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PROVISIONING_PROFILE = "";
+                               PUBLIC_HEADERS_FOLDER_PATH = /usr/include/cups;
+                               SDKROOT = iphoneos;
+                               SKIP_INSTALL = YES;
+                               STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static;
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+                       };
+                       name = Debug;
+               };
+               270696591CADF3E200FFE5FB /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       buildSettings = {
+                               CODE_SIGN_IDENTITY = "iPhone Developer";
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+                               COMBINE_HIDPI_IMAGES = YES;
+                               EXECUTABLE_EXTENSION = a;
+                               EXECUTABLE_PREFIX = "";
+                               PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                               PROVISIONING_PROFILE = "";
+                               PUBLIC_HEADERS_FOLDER_PATH = /usr/include/cups;
+                               SDKROOT = iphoneos;
+                               SKIP_INSTALL = YES;
+                               STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = static;
+                               SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+                       };
+                       name = Release;
+               };
                270CCDAD135E3C9E00007BE2 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
@@ -5039,6 +5255,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+               270696571CADF3E200FFE5FB /* Build configuration list for PBXNativeTarget "libcups_ios" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               270696581CADF3E200FFE5FB /* Debug */,
+                               270696591CADF3E200FFE5FB /* Release */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
+               };
                270CCDAF135E3C9E00007BE2 /* Build configuration list for PBXNativeTarget "testmime" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (

diff --git a/xcode/config.h b/xcode/config.h
index 8bb08af12c45d7d3690a05252a7e3915265a3fab..e370974513243de94c603f407b86f19820f1c79f 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -15,6 +15,8 @@
 #define _CUPS_CONFIG_H_
 
 #include <AvailabilityMacros.h>
+#include <TargetConditionals.h>
+
 
 /*
  * Version of software...
@@ -150,13 +152,12 @@
  * Do we have PAM stuff?
  */
 
-#ifndef HAVE_LIBPAM
-#define HAVE_LIBPAM 1
-#endif /* !HAVE_LIBPAM */
-
+#if TARGET_OS_OSX
+#  define HAVE_LIBPAM 1
 /* #undef HAVE_PAM_PAM_APPL_H */
-#define HAVE_PAM_SET_ITEM 1
-#define HAVE_PAM_SETCRED 1
+#  define HAVE_PAM_SET_ITEM 1
+#  define HAVE_PAM_SETCRED 1
+#endif /* TARGET_OS_OSX */
 
 
 /*
@@ -332,7 +333,10 @@
  * What Security framework headers do we have?
  */
 
-#define HAVE_AUTHORIZATION_H 1
+#if !TARGET_OS_IOS
+#  define HAVE_AUTHORIZATION_H 1
+#endif /* !TARGET_OS_IOS */
+
 /* #undef HAVE_SECBASEPRIV_H */
 #define HAVE_SECCERTIFICATE_H 1
 /* #undef HAVE_SECIDENTITYSEARCHPRIV_H */
@@ -347,30 +351,34 @@
  * Do we have the cssmErrorString function?
  */
 
-#define HAVE_CSSMERRORSTRING 1
+#if !TARGET_OS_IOS
+#  define HAVE_CSSMERRORSTRING 1
+#endif /* !TARGET_OS_IOS */
 
 
 /*
  * Do we have the SecGenerateSelfSignedCertificate function?
  */
 
-/* #undef HAVE_SECGENERATESELFSIGNEDCERTIFICATE */
+#if TARGET_OS_IOS
+#  define HAVE_SECGENERATESELFSIGNEDCERTIFICATE 1
+#endif /* TARGET_OS_IOS */
 
 
 /*
  * Do we have the SecKeychainOpen function?
  */
 
-#define HAVE_SECKEYCHAINOPEN 1
+#if !TARGET_OS_IOS
+#  define HAVE_SECKEYCHAINOPEN 1
+#endif /* !TARGET_OS_IOS */
 
 
 /*
  * Do we have (a working) SSLSetEnabledCiphers function?
  */
 
-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER
-#  define HAVE_SSLSETENABLEDCIPHERS 1
-#endif /* AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER */
+#define HAVE_SSLSETENABLEDCIPHERS 1
 
 
 /*
@@ -498,14 +506,16 @@
  * Various scripting languages...
  */
 
-#define HAVE_JAVA 1
-#define CUPS_JAVA "/usr/bin/java"
-#define HAVE_PERL 1
-#define CUPS_PERL "/usr/bin/perl"
-#define HAVE_PHP 1
-#define CUPS_PHP "/usr/bin/php"
-#define HAVE_PYTHON 1
-#define CUPS_PYTHON "/usr/bin/python"
+#if !TARGET_OS_IOS
+#  define HAVE_JAVA 1
+#  define CUPS_JAVA "/usr/bin/java"
+#  define HAVE_PERL 1
+#  define CUPS_PERL "/usr/bin/perl"
+#  define HAVE_PHP 1
+#  define CUPS_PHP "/usr/bin/php"
+#  define HAVE_PYTHON 1
+#  define CUPS_PYTHON "/usr/bin/python"
+#endif /* !TARGET_OS_IOS */
 
 
 /*
@@ -521,14 +531,18 @@
  * Do we have ApplicationServices public headers?
  */
 
-#define HAVE_APPLICATIONSERVICES_H 1
+#if !TARGET_OS_IOS
+#  define HAVE_APPLICATIONSERVICES_H 1
+#endif /* !TARGET_OS_IOS */
 
 
 /*
  * Do we have the SCDynamicStoreCopyComputerName function?
  */
 
-#define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1
+#if !TARGET_OS_IOS
+#  define HAVE_SCDYNAMICSTORECOPYCOMPUTERNAME 1
+#endif /* !TARGET_OS_IOS */
 
 
 /*
@@ -560,13 +574,15 @@
  * Do we have the GSSAPI support library (for Kerberos support)?
  */
 
-#define HAVE_GSS_ACQUIRE_CRED_EX_F 1
-#define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1
-#define HAVE_GSS_GSSAPI_H 1
+#if !TARGET_OS_IOS
+#  define HAVE_GSS_ACQUIRE_CRED_EX_F 1
+#  define HAVE_GSS_C_NT_HOSTBASED_SERVICE 1
+#  define HAVE_GSS_GSSAPI_H 1
 /* #undef HAVE_GSS_GSSAPI_SPI_H */
-#define HAVE_GSSAPI 1
+#  define HAVE_GSSAPI 1
 /* #undef HAVE_GSSAPI_GSSAPI_H */
 /* #undef HAVE_GSSAPI_H */
+#endif /* !TARGET_OS_IOS */
 
 
 /*
@@ -680,7 +696,9 @@
  * Location of OS X localization bundle, if any.
  */
 
-#define CUPS_BUNDLEDIR "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
+#if !TARGET_OS_IOS
+#  define CUPS_BUNDLEDIR "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A"
+#endif /* !TARGET_OS_IOS */
 
 
 /*