From: mike Date: Mon, 18 Jun 2007 23:40:38 +0000 (+0000) Subject: Cleanup help text for configure script. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18cff779ca7fcbd64288ed686b2fe832b37ab32d;p=thirdparty%2Fcups.git Cleanup help text for configure script. Add support for Mac OS X sectorder files for the scheduler and CUPS libraries. Add support for CUPSD_LAUNCHD environment variable in scheduler so that we can do basic profiling to optimize launch times. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6564 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/Makedefs.in b/Makedefs.in index ab262c0de6..570b76493f 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -139,6 +139,7 @@ LAUNCHDLIBS = @LAUNCHDLIBS@ LDFLAGS = -L../cups -L../filter @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) LEGACY_BACKENDS = @LEGACY_BACKENDS@ +LIBCUPSORDER = @LIBCUPSORDER@ LINKCUPS = @LINKCUPS@ $(SSLLIBS) LINKCUPSIMAGE = @LINKCUPSIMAGE@ LIBS = $(LINKCUPS) $(COMMONLIBS) diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 712cd32786..c0aacfa1a3 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -196,6 +196,11 @@ CUPS_SYSTEM_AUTHKEY="" AC_ARG_ENABLE(dbus, [ --enable-dbus enable DBUS support, default=auto]) +AC_ARG_WITH(libcupsorder, [ --with-libcupsorder libcups secorder file, default=libcups.order], + LIBCUPSORDER="$withval", + LIBCUPSORDER="libcups.order") +AC_SUBST(LIBCUPSORDER) + FONTS="fonts" AC_SUBST(FONTS) LEGACY_BACKENDS="parallel scsi" @@ -206,7 +211,7 @@ case $uname in FONTS="" LEGACY_BACKENDS="" BACKLIBS="-framework IOKit" - CUPSDLIBS="-framework IOKit -framework SystemConfiguration" + CUPSDLIBS="-sectorder __TEXT __text cupsd.order -e start -framework IOKit -framework SystemConfiguration" LIBS="-framework CoreFoundation $LIBS" dnl Check for CFLocaleCreateCanonicalLocaleIdentifierFromString... diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 360910a0d1..acdc98a023 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -11,11 +11,11 @@ dnl Copyright ... dnl dnl -AC_ARG_ENABLE(dnssd, [ --enable-dnssd turn on DNS Service Discovery support, default=yes]) -AC_ARG_WITH(dnssd-libs, [ --with-dnssd-libs set directory for DNS Service Discovery library], +AC_ARG_ENABLE(dnssd, [ --enable-dnssd turn on DNS Service Discovery support, default=yes]) +AC_ARG_WITH(dnssd-libs, [ --with-dnssd-libs set directory for DNS Service Discovery library], LDFLAGS="-L$withval $LDFLAGS" DSOFLAGS="-L$withval $DSOFLAGS",) -AC_ARG_WITH(dnssd-includes, [ --with-dnssd-includes set directory for DNS Service Discovery includes], +AC_ARG_WITH(dnssd-includes, [ --with-dnssd-includes set directory for DNS Service Discovery includes], CFLAGS="-I$withval $CFLAGS" CXXFLAGS="-I$withval $CXXFLAGS" CPPFLAGS="-I$withval $CPPFLAGS",) diff --git a/cups/Makefile b/cups/Makefile index f42bce6557..388d3f00fa 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -271,12 +271,14 @@ libcups.so.2 libcups.sl.2: $(LIBOBJS) # libcups.2.dylib # -libcups.2.dylib: $(LIBOBJS) +libcups.2.dylib: $(LIBOBJS) $(LIBCUPSORDER) echo Linking $@... $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \ -install_name $(libdir)/$@ \ -current_version 2.8.0 \ -compatibility_version 2.0.0 \ + -exported_symbols_list libcups.exp \ + -sectorder __TEXT __text $(LIBCUPSORDER) \ $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) $(RM) libcups.dylib $(LN) $@ libcups.dylib diff --git a/cups/libcups.exp b/cups/libcups.exp new file mode 100644 index 0000000000..ccb605c6ae --- /dev/null +++ b/cups/libcups.exp @@ -0,0 +1,293 @@ +__cups_strcpy +__cupsAdminGetServerSettings +__cupsAdminSetServerSettings +__cupsCharmapFlush +__cupsCharmapFree +__cupsCharmapGet +__cupsEncodingName +__cupsGetPassword +__cupsGlobals +__cupsLangPrintf +__cupsLangPuts +__cupsLangString +__cupsMD5Append +__cupsMD5Finish +__cupsMD5Init +__cupsMessageFree +__cupsMessageLoad +__cupsMessageLookup +__cupsSetError +__cupsSetLocale +__cupsStrAlloc +__cupsStrFlush +__cupsStrFormatd +__cupsStrFree +__cupsStrScand +__cupsStrStatistics +__httpReadCDSA +__httpWriteCDSA +__ippAddAttr +__ippFindOption +__ippFreeAttr +__ppdGetEncoding +_cupsAddDest +_cupsAddOption +_cupsAdminCreateWindowsPPD +_cupsAdminExportSamba +_cupsAdminGetServerSettings +_cupsAdminSetServerSettings +_cupsArrayAdd +_cupsArrayClear +_cupsArrayCount +_cupsArrayCurrent +_cupsArrayDelete +_cupsArrayDup +_cupsArrayFind +_cupsArrayFirst +_cupsArrayGetIndex +_cupsArrayGetInsert +_cupsArrayIndex +_cupsArrayInsert +_cupsArrayLast +_cupsArrayNew +_cupsArrayNext +_cupsArrayPrev +_cupsArrayRemove +_cupsArrayRestore +_cupsArraySave +_cupsArrayUserData +_cupsBackChannelRead +_cupsBackChannelWrite +_cupsBackendDeviceURI +_cupsCancelJob +_cupsCharsetToUTF8 +_cupsDirClose +_cupsDirOpen +_cupsDirRead +_cupsDirRewind +_cupsDoAuthentication +_cupsDoFileRequest +_cupsDoRequest +_cupsEncodeOptions +_cupsEncodeOptions2 +_cupsEncryption +_cupsFileClose +_cupsFileCompression +_cupsFileEOF +_cupsFileFind +_cupsFileFlush +_cupsFileGetChar +_cupsFileGetConf +_cupsFileGetLine +_cupsFileGets +_cupsFileLock +_cupsFileNumber +_cupsFileOpen +_cupsFileOpenFd +_cupsFilePeekChar +_cupsFilePrintf +_cupsFilePutChar +_cupsFilePuts +_cupsFileRead +_cupsFileRewind +_cupsFileSeek +_cupsFileStderr +_cupsFileStdin +_cupsFileStdout +_cupsFileTell +_cupsFileUnlock +_cupsFileWrite +_cupsFreeDests +_cupsFreeJobs +_cupsFreeOptions +_cupsGetClasses +_cupsGetDefault +_cupsGetDefault2 +_cupsGetDest +_cupsGetDests +_cupsGetDests2 +_cupsGetFd +_cupsGetFile +_cupsGetJobs +_cupsGetJobs2 +_cupsGetOption +_cupsGetPassword +_cupsGetPPD +_cupsGetPPD2 +_cupsGetPrinters +_cupsLangDefault +_cupsLangEncoding +_cupsLangFlush +_cupsLangFree +_cupsLangGet +_cupsLastError +_cupsLastErrorString +_cupsMarkOptions +_cupsNotifySubject +_cupsNotifyText +_cupsParseOptions +_cupsPrintFile +_cupsPrintFile2 +_cupsPrintFiles +_cupsPrintFiles2 +_cupsPutFd +_cupsPutFile +_cupsRemoveDest +_cupsRemoveOption +_cupsServer +_cupsSetDefaultDest +_cupsSetDests +_cupsSetDests2 +_cupsSetEncryption +_cupsSetPasswordCB +_cupsSetServer +_cupsSetUser +_cupsSideChannelDoRequest +_cupsSideChannelRead +_cupsSideChannelWrite +_cupsTempFd +_cupsTempFile +_cupsTempFile2 +_cupsUser +_cupsUTF32ToUTF8 +_cupsUTF8ToCharset +_cupsUTF8ToUTF32 +_httpAddrAny +_httpAddrConnect +_httpAddrEqual +_httpAddrFreeList +_httpAddrGetList +_httpAddrLength +_httpAddrLocalhost +_httpAddrLookup +_httpAddrString +_httpAssembleURI +_httpAssembleURIf +_httpBlocking +_httpCheck +_httpClearCookie +_httpClearFields +_httpClose +_httpConnect +_httpConnectEncrypt +_httpDecode64 +_httpDecode64_2 +_httpDelete +_httpEncode64 +_httpEncode64_2 +_httpEncryption +_httpError +_httpFlush +_httpFlushWrite +_httpGet +_httpGetBlocking +_httpGetCookie +_httpGetDateString +_httpGetDateString2 +_httpGetDateTime +_httpGetFd +_httpGetField +_httpGetHostByName +_httpGetHostname +_httpGetLength +_httpGetLength2 +_httpGets +_httpGetStatus +_httpGetSubField +_httpGetSubField2 +_httpHead +_httpInitialize +_httpMD5 +_httpMD5Final +_httpMD5String +_httpOptions +_httpPost +_httpPrintf +_httpPut +_httpRead +_httpRead2 +_httpReconnect +_httpSeparate +_httpSeparate2 +_httpSeparateURI +_httpSetCookie +_httpSetExpect +_httpSetField +_httpSetLength +_httpStatus +_httpTrace +_httpUpdate +_httpWait +_httpWrite +_httpWrite2 +_ippAddBoolean +_ippAddBooleans +_ippAddCollection +_ippAddCollections +_ippAddDate +_ippAddInteger +_ippAddIntegers +_ippAddOctetString +_ippAddRange +_ippAddRanges +_ippAddResolution +_ippAddResolutions +_ippAddSeparator +_ippAddString +_ippAddStrings +_ippDateToTime +_ippDelete +_ippDeleteAttribute +_ippErrorString +_ippErrorValue +_ippFindAttribute +_ippFindNextAttribute +_ippLength +_ippNew +_ippNewRequest +_ippOpString +_ippOpValue +_ippPort +_ippRead +_ippReadFile +_ippReadIO +_ippSetPort +_ippTimeToDate +_ippWrite +_ippWriteFile +_ippWriteIO +_ppdClose +_ppdCollect +_ppdCollect2 +_ppdConflicts +_ppdEmit +_ppdEmitAfterOrder +_ppdEmitFd +_ppdEmitJCL +_ppdEmitJCLEnd +_ppdEmitString +_ppdErrorString +_ppdFindAttr +_ppdFindChoice +_ppdFindCustomOption +_ppdFindCustomParam +_ppdFindMarkedChoice +_ppdFindNextAttr +_ppdFindOption +_ppdFirstCustomParam +_ppdFirstOption +_ppdIsMarked +_ppdLastError +_ppdLocalize +_ppdMarkDefaults +_ppdMarkOption +_ppdNextCustomParam +_ppdNextOption +_ppdOpen +_ppdOpen2 +_ppdOpenFd +_ppdOpenFile +_ppdPageLength +_ppdPageSize +_ppdPageWidth +_ppdSetConformance diff --git a/cups/libcups.order b/cups/libcups.order new file mode 100755 index 0000000000..92820f7c2b --- /dev/null +++ b/cups/libcups.order @@ -0,0 +1 @@ +single module:dyld_stub_binding_helper diff --git a/scheduler/cupsd.order b/scheduler/cupsd.order new file mode 100644 index 0000000000..adf0c5bc59 --- /dev/null +++ b/scheduler/cupsd.order @@ -0,0 +1,93 @@ +506502610382 _dyld_func_lookup +506502685257 main +506502715804 cupsdSetString +506506372025 cupsdFindLocation +506506395599 cupsdAddLocation +506506422618 compare_locations +506506442028 cupsdAllowIP +506506459141 add_allow +506506478809 read_location +506506500685 parse_aaa +506506520354 cupsdAllowHost +506506554362 cupsdAddName +506506578477 read_policy +506506595949 cupsdAddPolicy +506506651840 cupsdAddPolicyOp +506506850180 cupsdCheckPermissions +506507063184 cupsdInitEnv +506507083008 clear_env +506507102454 cupsdSetEnv +506507138155 cupsdSetEnvf +506507189792 cupsdFindPolicy +506507227839 cupsdDeleteAllSubscriptions +506507248359 cupsdFreeAllJobs +506507267439 cupsdDeleteAllClasses +506507286520 cupsdDeleteAllPrinters +506507307556 mimeLoad +506507324314 mimeMerge +506507355197 mimeNew +506507441845 load_types +506507518598 mimeAddType +506507536778 mimeType +506507556897 mimeAddTypeRule +506507593083 compare_types +506508272080 load_convs +506508326621 add_fcache +506508359303 mimeAddFilter +506508378534 mimeFilterLookup +506508403668 compare_fcache +506508429895 compare_filters +506509114255 delete_fcache +506509154834 mimeNumFilters +506509172690 mimeNumTypes +506509206171 mimeFirstType +506509228911 mimeNextType +506509325837 cupsdLoadBanners +506509344611 free_banners +506509424863 add_banner +506509442851 mimeFileType +506509475474 checkrules +506509509518 patmatch +506509582672 compare_banners +506509797932 cupsdLoadAllPrinters +506509854963 cupsdAddPrinter +506509925950 cupsdSetPrinterAttrs +506509947124 cupsdCreateCommonData +506510213823 delete_printer_filters +506510235340 mimeFirstFilter +506510252530 mimeNextFilter +506510273476 cupsdFindBest +506510293397 cupsdFindPolicyOp +506510353536 cupsdSanitizeURI +506511563302 add_printer_filter +506511697758 add_printer_formats +506511719725 mimeFilter +506511737533 compare_srcs +506511764984 find_filters +506512606253 add_printer_defaults +506512654206 cupsdRegisterPrinter +506512674342 cupsdAddPrinterHistory +506512737170 compare_printers +506524108560 cupsdLoadAllClasses +506524143324 cupsdLoadRemoteCache +506524177711 cupsdWritePrintcap +506524527469 cupsdLoadAllJobs +506524564508 load_job_cache +506524756314 compare_jobs +506524815667 cupsdLoadJob +506524968952 cupsdLoadAllSubscriptions +506525011690 launchd_checkin +506503187119 cupsdStartSelect +506503230913 cupsdReadConfiguration +506503252142 cupsdDeleteAllLocations +506503274576 cupsdDeleteAllListeners +506503310703 cupsdSetStringf +506503363312 cupsdClearString +506505395867 parse_protocols +506505440694 cupsdDeleteAllPolicies +506505501913 read_configuration +506505561788 parse_groups +506505726179 get_address +506505986926 cupsdLogMessage +506506008280 check_log_file +506506240383 cupsdGetDateTime diff --git a/scheduler/main.c b/scheduler/main.c index 80fcf6c205..58877744be 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -166,6 +166,14 @@ main(int argc, /* I - Number of command-line args */ fg = 0; +#ifdef HAVE_LAUNCHD + if (getenv("CUPSD_LAUNCHD")) + { + Launchd = 1; + fg = 1; + } +#endif /* HAVE_LAUNCHD */ + for (i = 1; i < argc; i ++) if (argv[i][0] == '-') for (opt = argv[i] + 1; *opt != '\0'; opt ++)