Changeset 19330

Show
Ignore:
Timestamp:
09/30/06 12:22:05 (2 years ago)
Author:
patrick
Message:

Allow calling code to pass in a subdirectory of -IBASE_DIR/include for
finding headers. This is needed for proper handling of versioned header
directories.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/macros/vrj-helpers.m4

    r18975 r19330  
    629629dnl 
    630630dnl Usage 
    631 dnl     VJ_APP_COMPILER(C-compiler, C-flags, C++-compiler, C++-flags, debug-flags, optimization-flags, base-dir, defs, includes, extra-flags) 
     631dnl     VJ_APP_COMPILER(C-compiler, C-flags, C++-compiler, C++-flags, debug-flags, optimization-flags, base-dir, defs, includes, extra-flags, header-subdir) 
    632632dnl --------------------------------------------------------------------------- 
    633633AC_DEFUN([VJ_APP_COMPILER], 
    …… 
    653653    APP_OPTIM_CFLAGS="$6 -D_OPT -DNDEBUG" 
    654654    APP_DEFS="$8" 
    655     APP_INCLUDES=ifelse([$7], , "$9", "-I\$($7)/include $9") 
     655    APP_INCLUDES=ifelse([$7], , "$9", "-I\$($7)/include/$11 $9") 
    656656    APP_EXTRA_CFLAGS="$10" 
    657657