(file) Return to platform_HPUX_ACC.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_HPUX_ACC.mak between version 1.42.2.1 and 1.48

version 1.42.2.1, 2006/02/10 16:09:05 version 1.48, 2008/06/05 17:33:02
Line 75 
Line 75 
  
 DEFINES += -DPEGASUS_USE_SYSLOGS DEFINES += -DPEGASUS_USE_SYSLOGS
  
 DEFINES += -DPEGASUS_HAS_SIGNALS  
   
 ifdef PEGASUS_USE_EMANATE ifdef PEGASUS_USE_EMANATE
  DEFINES += -DHPUX_EMANATE  DEFINES += -DHPUX_EMANATE
 endif endif
Line 89 
Line 87 
  DEFINES += -DPEGASUS_PURIFY  DEFINES += -DPEGASUS_PURIFY
 endif endif
  
 ##  
 ## The following flags need to be set or unset  
 ## to compile-in the code required for PAM authentication  
 ## and compile-out the code that uses the password file.  
 ##  
   
 ifdef PEGASUS_PAM_AUTHENTICATION  
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  
 endif  
   
 # l10n  
 ifdef PEGASUS_HAS_MESSAGES  
   DEFINES += -DPEGASUS_HAS_MESSAGES  
   ifdef ICU_ROOT  
         MSG_COMPILE = ${ICU_INSTALL}/bin/genrb  
         MSG_FLAGS =  
         MSG_SOURCE_EXT = .txt  
         MSG_COMPILE_EXT = .res  
         CNV_ROOT_CMD = cnv2rootbundle  
   
 ##################################  
 ##  
 ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root  
 ## resource bundle, default is to uppercase the root resource bundle^M  
 ##  
 ##################################  
   
 ifdef ICU_NO_UPPERCASE_ROOT  
   CNV_ROOT_FLAGS =  
 else  
   CNV_ROOT_FLAGS = -u  
 endif  
   
 ####################################  
 ##  
 ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource  
 ## bundle will be generated from defaults to _en if not set.  if set, for  
 ## any directory containing resource bundles, there must exist a file name:  
 ## package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages  
 ## target will fail  
 ##  
 ####################################  
   
 ifdef ICU_ROOT_BUNDLE_LANG  
   MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)  
 else  
   MSG_ROOT_SOURCE = _en  
 endif  
   
     SYS_INCLUDES += -I${ICU_ROOT}/source/common  
     SYS_INCLUDES += -I${ICU_ROOT}/source/i18n  
     DEFINES += -DPEGASUS_HAS_ICU  
     ifdef ICU_INSTALL  
       EXTRA_LIBRARIES += -L${ICU_INSTALL}/lib -licui18n -licuuc  
     endif  
   endif  
 endif  
   
   
 DEPEND_INCLUDES = DEPEND_INCLUDES =
  
  
Line 169 
Line 108 
   FLAGS += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib   FLAGS += -Wl,+b$(PEGASUS_DEST_LIB_DIR):/usr/lib
   ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)   ifeq ($(PEGASUS_PLATFORM), HPUX_PARISC_ACC)
     FLAGS += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR)     FLAGS += -Wl,+cdp,$(PEGASUS_PLATFORM_SDKROOT)/usr/lib:/usr/lib -Wl,+cdp,$(PEGASUS_HOME)/lib:$(PEGASUS_DEST_LIB_DIR)
       ifdef OPENSSL_HOME
         FLAGS += -Wl,+cdp,$(OPENSSL_HOME)/lib:/usr/lib
       endif
       ifdef ICU_INSTALL
         FLAGS += -Wl,+cdp,$(ICU_INSTALL)/lib:$(PEGASUS_DEST_LIB_DIR)
       endif
   endif   endif
 else else
   ifdef PEGASUS_HAS_MESSAGES   ifdef PEGASUS_HAS_MESSAGES
     ifdef ICU_ROOT  
       ifdef ICU_INSTALL       ifdef ICU_INSTALL
         FLAGS += -Wl,+b$(LIB_DIR):/usr/lib:${ICU_INSTALL}/lib         FLAGS += -Wl,+b$(LIB_DIR):/usr/lib:${ICU_INSTALL}/lib
       endif       endif
     endif  
   else   else
     FLAGS += -Wl,+b$(LIB_DIR):/usr/lib     FLAGS += -Wl,+b$(LIB_DIR):/usr/lib
   endif   endif


Legend:
Removed from v.1.42.2.1  
changed lines
  Added in v.1.48

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2