(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.43 and 1.55

version 1.43, 2006/02/01 21:10:48 version 1.55, 2008/03/11 19:39:49
Line 53 
Line 53 
  
 # Enable CMPI by default. # Enable CMPI by default.
 # #
 PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=yes  ifndef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
   PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
   endif
  
 ######################################################################### #########################################################################
  
Line 91 
Line 93 
  
 DEFINES += -DPEGASUS_USE_SYSLOGS DEFINES += -DPEGASUS_USE_SYSLOGS
  
 DEFINES += -DPEGASUS_HAS_SIGNALS  SYS_LIBS = -ldl -lpthread -lcrypt
   
 SYS_LIBS = -ldl -lpthread  
  
 # PAM support # PAM support
 ifdef PEGASUS_PAM_AUTHENTICATION ifdef PEGASUS_PAM_AUTHENTICATION
    ifeq ($(HPUX_IA64_VERSION), yes)  
       SYS_LIBS += -L$(PAMLIB_HOME) -lpam  
    else  
       SYS_LIBS += -lpam       SYS_LIBS += -lpam
    endif  
  
 ## The following flags need to be set or unset ## The following flags need to be set or unset
 ## to compile-in the code required for PAM authentication ## to compile-in the code required for PAM authentication
 ## and compile-out the code that uses the password file. ## and compile-out the code that uses the password file.
  
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE
   
 endif endif
  
 FLAGS += -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT  FLAGS += -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
   
   ##==============================================================================
   ##
   ## The DYNAMIC_FLAGS variable defines linker flags that only apply to shared
   ## libraries.
   ##
   ##==============================================================================
   DYNAMIC_FLAGS += -fPIC
  
 ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
   FLAGS += -g   FLAGS += -g
Line 133 
Line 136 
  
 FLAGS += $(CXX_MACHINE_OPTIONS) FLAGS += $(CXX_MACHINE_OPTIONS)
  
   ifdef PEGASUS_ENABLE_GCOV
     FLAGS += -ftest-coverage -fprofile-arcs
     SYS_LIBS += -lgcc -lgcov
     EXTRA_LIBRARIES += -lgcc -lgcov
   endif
   
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
Line 140 
Line 149 
 # l10n # l10n
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
   DEFINES += -DPEGASUS_HAS_MESSAGES   DEFINES += -DPEGASUS_HAS_MESSAGES
   ifdef ICU_ROOT    ifeq ($(PEGASUS_HAS_ICU), true)
         MSG_COMPILE = genrb         MSG_COMPILE = genrb
         MSG_FLAGS =         MSG_FLAGS =
         MSG_SOURCE_EXT = .txt         MSG_SOURCE_EXT = .txt
         MSG_COMPILE_EXT = .res         MSG_COMPILE_EXT = .res
         CNV_ROOT_CMD = cnv2rootbundle          CNV_ROOT_CMD = $(BIN_DIR)/cnv2rootbundle
  
 ################################## ##################################
 ## ##
Line 173 
Line 182 
   MSG_ROOT_SOURCE = _en   MSG_ROOT_SOURCE = _en
 endif endif
  
       ifdef ICU_ROOT
     SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n     SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n
       endif
     DEFINES += -DPEGASUS_HAS_ICU     DEFINES += -DPEGASUS_HAS_ICU
     EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata      ifdef ICU_INSTALL
         EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib
       endif
       EXTRA_LIBRARIES += -licuuc -licui18n -licudata
   endif   endif
 endif endif
  
 ####################################  ##==============================================================================
 ## ##
 ##   If PEGASUS_LSB is set, set the rest of the variables.  ## Set the default visibility symbol to hidden for shared libraries. This
   ## feature is only available in GCC 4.0 and later.
 ## ##
 ####################################  ##==============================================================================
  
 ifdef PEGASUS_LSB  ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1)
     SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/      FLAGS += -fvisibility=hidden
     FLAGS += -DPEGASUS_OS_LSB  
 endif endif
  
   ifndef PEGASUS_ARCH_LIB
       ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)
           PEGASUS_ARCH_LIB = lib64
       else
           PEGASUS_ARCH_LIB = lib
       endif
   endif
   DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"


Legend:
Removed from v.1.43  
changed lines
  Added in v.1.55

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2