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

Diff for /pegasus/mak/config-linux.mak between version 1.48 and 1.58

version 1.48, 2006/06/19 19:37:25 version 1.58, 2008/06/05 17:33:02
Line 93 
Line 93 
  
 DEFINES += -DPEGASUS_USE_SYSLOGS DEFINES += -DPEGASUS_USE_SYSLOGS
  
 DEFINES += -DPEGASUS_HAS_SIGNALS  SYS_LIBS = -ldl -lpthread -lcrypt
  
 SYS_LIBS = -ldl -lpthread  FLAGS += -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
  
 # PAM support  ##==============================================================================
 ifdef PEGASUS_PAM_AUTHENTICATION  ##
    ifeq ($(HPUX_IA64_VERSION), yes)  ## The DYNAMIC_FLAGS variable defines linker flags that only apply to shared
       SYS_LIBS += -L$(PAMLIB_HOME) -lpam  ## libraries.
    else  ##
       SYS_LIBS += -lpam  ##==============================================================================
    endif  DYNAMIC_FLAGS += -fPIC
   
 ## 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.  
   
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  
   
 endif  
   
 FLAGS += -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT  
  
 ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
   FLAGS += -g   FLAGS += -g
Line 145 
Line 135 
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
  
 # l10n  
 ifdef PEGASUS_HAS_MESSAGES  
   DEFINES += -DPEGASUS_HAS_MESSAGES  
   ifdef ICU_ROOT  
         MSG_COMPILE = 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##  
 ##################################  
   
 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 -I${ICU_ROOT}/source/i18n  
     DEFINES += -DPEGASUS_HAS_ICU  
     EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata  
   endif  
 endif  
   
 ####################################  
 ##  
 ##   If PEGASUS_LSB is set, set the rest of the variables.  
 ##  
 ####################################  
   
 ifdef PEGASUS_LSB  
     SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/  
     FLAGS += -DPEGASUS_OS_LSB  
 endif  
   
 ##============================================================================== ##==============================================================================
 ## ##
 ## Set the default visibility symbol to hidden for shared libraries. This ## Set the default visibility symbol to hidden for shared libraries. This
Line 217 
Line 154 
     endif     endif
 endif endif
 DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\" DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"
   
   


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

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2