(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.42 and 1.56.4.1

version 1.42, 2006/01/30 16:16:22 version 1.56.4.1, 2008/07/01 15:17:27
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  
 ifdef PEGASUS_PAM_AUTHENTICATION  
    ifeq ($(HPUX_IA64_VERSION), yes)  
       SYS_LIBS += -L$(PAMLIB_HOME) -lpam  
    else  
       SYS_LIBS += -lpam  
    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.  
  
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  FLAGS += -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
   
 endif  
  
   ##==============================================================================
   ##
   ## 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 -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT    FLAGS += -g
 else else
 FLAGS += -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -s    FLAGS += -s
     #
     # The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
     # appeared in the 3.0 series of compilers.
     #
     ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
   EXTRA_CXX_FLAGS += -fno-enforce-eh-specs   EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
     endif
   ifdef PEGASUS_OPTIMIZE_FOR_SIZE   ifdef PEGASUS_OPTIMIZE_FOR_SIZE
     FLAGS += -Os     FLAGS += -Os
   else   else
Line 126 
Line 125 
  
 FLAGS += $(CXX_MACHINE_OPTIONS) FLAGS += $(CXX_MACHINE_OPTIONS)
  
 ifndef PEGASUS_USE_MU_DEPEND  ifdef PEGASUS_ENABLE_GCOV
 PEGASUS_HAS_MAKEDEPEND = yes    FLAGS += -ftest-coverage -fprofile-arcs
     SYS_LIBS += -lgcc -lgcov
     EXTRA_LIBRARIES += -lgcc -lgcov
 endif endif
  
 # l10n  ifndef PEGASUS_USE_MU_DEPEND
 ifdef PEGASUS_HAS_MESSAGES  PEGASUS_HAS_MAKEDEPEND = yes
   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 endif
  
 ####################################  ##==============================================================================
 ## ##
 ##   ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource bundle will be generated from  ## Set the default visibility symbol to hidden for shared libraries. This
 ##   defaults to _en if not set.  if set, for any directory containing resource bundles,  ## feature is only available in GCC 4.0 and later.
 ##   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  ifeq ($(shell expr $(GCC_VERSION) '>=' 4.0), 1)
   MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)      FLAGS += -fvisibility=hidden
 else  
   MSG_ROOT_SOURCE = _en  
 endif endif
  
     SYS_INCLUDES += -I${ICU_ROOT}/source/common -I${ICU_ROOT}/source/i18n  ifndef PEGASUS_ARCH_LIB
     DEFINES += -DPEGASUS_HAS_ICU      ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_GNU)
     EXTRA_LIBRARIES += -L$(ICU_INSTALL)/lib -licuuc -licui18n -licudata          PEGASUS_ARCH_LIB = lib64
       else
           PEGASUS_ARCH_LIB = lib
   endif   endif
 endif endif
   DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"
 ####################################  
 ##  
 ##   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  
   


Legend:
Removed from v.1.42  
changed lines
  Added in v.1.56.4.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2