Changeset 18726

Show
Ignore:
Timestamp:
04/22/06 09:40:12 (3 years ago)
Author:
patrick
Message:

Ensure that $TWEEK_CONFIG is set before doing anything in TWEEK_PATH_CXX()
and TWEEK_PATH_JAVA(). There might be a beteter way of doing this, but
AC_REQUIRE() is not quite sufficient. All that does is ensure that the
_TWEEK_PATH_SETUP macro is expanded before either of those macros, but
that does not guarantee that $TWEEK_CONFIG is actually set to anything.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/macros/tweek.m4

    r18342 r18726  
    9292   DPP_PREREQ([2.0.1]) 
    9393 
    94    AC_REQUIRE([_TWEEK_PATH_SETUP]) 
     94   if test "x$TWEEK_CONFIG" = "x" ; then 
     95      _TWEEK_PATH_SETUP() 
     96   fi 
    9597 
    9698   if test "x$TWEEK_CONFIG" = "xno" ; then 
    …… 
    135137AC_DEFUN([TWEEK_PATH_CXX], 
    136138[ 
    137    AC_REQUIRE([_TWEEK_PATH_SETUP]) 
     139   if test "x$TWEEK_CONFIG" = "x" ; then 
     140      _TWEEK_PATH_SETUP() 
     141   fi 
    138142 
    139143   TWEEK_CXXFLAGS="" 
    …… 
    255259AC_DEFUN([TWEEK_PATH_JAVA], 
    256260[ 
    257    AC_REQUIRE([_TWEEK_PATH_SETUP]) 
     261   if test "x$TWEEK_CONFIG" = "x" ; then 
     262      _TWEEK_PATH_SETUP() 
     263   fi 
    258264 
    259265   TWEEK_JAVA_IDL='' 
    …… 
    313319AC_DEFUN([TWEEK_PATH_PYTHON], 
    314320[ 
    315    AC_REQUIRE([_TWEEK_PATH_SETUP]) 
    316  
    317    TWEEK_PYTHON_IDL='' 
    318    TWEEK_PYTHON_IDL_OPTS='' 
     321   if test "x$TWEEK_CONFIG" = "x" ; then 
     322      _TWEEK_PATH_SETUP() 
     323   fi 
     324 
    319325   TWEEK_PYTHON_IDL_GENDIR_OPT='' 
    320326   TWEEK_PYTHON_IDL_INCFLAG=''