(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.2.6.1 and 1.10

version 1.2.6.1, 2003/07/16 21:45:25 version 1.10, 2003/12/12 17:46:33
Line 30 
Line 30 
  
 DEFINES += -DPEGASUS_HAS_SIGNALS DEFINES += -DPEGASUS_HAS_SIGNALS
  
 ifdef PEGASUS_USES_GCCV3  
   SYS_INCLUDES = -I/usr/include/g++-3  
 else  
   SYS_INCLUDES = -I/usr/include/g++  
 endif  
   
 SYS_LIBS = -ldl -lpthread -lcrypt SYS_LIBS = -ldl -lpthread -lcrypt
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
Line 80 
Line 74 
 FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
 endif endif
  
 ifdef PEGASUS_NO_SLP  
   FLAGS += -DPEGASUS_NO_SLP  
   NO_SLP = true  
 endif  
   
 ifdef PEGASUS_HAS_PERFINST ifdef PEGASUS_HAS_PERFINST
   FLAGS += -DPEGASUS_HAS_PERFINST   FLAGS += -DPEGASUS_HAS_PERFINST
 endif endif
Line 100 
Line 89 
 ifdef USE_CONNECTLOCAL ifdef USE_CONNECTLOCAL
  FLAGS += -DUSE_CONNECTLOCAL  FLAGS += -DUSE_CONNECTLOCAL
 endif endif
   
   # Warning: Setting the PEGASUS_USE_DEPRECATED_INTERFACES flag exposes
   # deprecated interfaces in externally-facing header files.  The deprecated
   # interfaces may not be compatible with subsequent Pegasus releases.
   # This flag should be used only for transitionary compatibility with
   # existing code and not for new development.
   
   ifdef PEGASUS_USE_DEPRECATED_INTERFACES
     DEFINES += -DPEGASUS_USE_DEPRECATED_INTERFACES
   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
   
       EXTRA_INCLUDES += -I${ICUROOT}/source/common
       DEFINES += -DPEGASUS_HAS_ICU
       SYS_LIBS += -licuuc
       SYS_LIBS += -licui18n
     endif
   endif


Legend:
Removed from v.1.2.6.1  
changed lines
  Added in v.1.10

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2