Changeset 19745

Show
Ignore:
Timestamp:
01/03/07 15:05:47 (2 years ago)
Author:
patrick
Message:

Deal with Autoconf 2.60 changes. The $datadir variable now has the value
${datarootdir}, which is fine for a makefile but doesn't work well in the
context of the configure script. This probably means that these configure
scripts are abusing "internal" Autoconf variables, but oh well.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/gadgeteer/configure.ac

    r19729 r19745  
    381381fi 
    382382 
     383# In Autoconf 2.60, datadir has been renamed to datarootdir. 
     384if test "x$datarootdir" != "x" ; then 
     385   data_var="$datarootdir" 
     386else 
     387   data_var="$datadir" 
     388fi 
     389 
    383390# Make a best-effort attempt to extract the actual share directory from the 
    384391# full installation prefix.  This is not foolproof, but it will work in almost 
    385392# all cases.  A person would have to be doing something malicious or foolish 
    386393# to make it break. 
    387 data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
     394data_subdir=`echo "$data_var" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    388395GADGET_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    389396 

  • juggler/trunk/modules/jackal/configure.ac

    r19729 r19745  
    354354fi 
    355355 
     356# In Autoconf 2.60, datadir has been renamed to datarootdir. 
     357if test "x$datarootdir" != "x" ; then 
     358   data_var="$datarootdir" 
     359else 
     360   data_var="$datadir" 
     361fi 
     362 
    356363# Make a best-effort attempt to extract the actual share directory from the 
    357364# full installation prefix.  This is not foolproof, but it will work in almost 
    358365# all cases.  A person would have to be doing something malicious or foolish 
    359366# to make it break. 
    360 data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
     367data_subdir=`echo "$data_var" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    361368JCCL_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    362369 

  • juggler/trunk/modules/sonix/configure.ac

    r19729 r19745  
    300300fi 
    301301 
     302# In Autoconf 2.60, datadir has been renamed to datarootdir. 
     303if test "x$datarootdir" != "x" ; then 
     304   data_var="$datarootdir" 
     305else 
     306   data_var="$datadir" 
     307fi 
     308 
    302309# Make a best-effort attempt to extract the actual share directory from the 
    303310# full installation prefix.  This is not foolproof, but it will work in almost 
    304311# all cases.  A person would have to be doing something malicious or foolish 
    305312# to make it break. 
    306 data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
     313data_subdir=`echo "$data_var" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    307314SNX_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    308315 

  • juggler/trunk/modules/tweek/configure.ac

    r19729 r19745  
    12761276fi 
    12771277 
     1278# In Autoconf 2.60, datadir has been renamed to datarootdir. 
     1279if test "x$datarootdir" != "x" ; then 
     1280   data_var="$datarootdir" 
     1281else 
     1282   data_var="$datadir" 
     1283fi 
     1284 
    12781285# Make a best-effort attempt to extract the actual share directory from the 
    12791286# full installation prefix.  This is not foolproof, but it will work in almost 
    12801287# all cases.  A person would have to be doing something malicious or foolish 
    12811288# to make it break. 
    1282 data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
     1289data_subdir=`echo "$data_var" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    12831290TWEEK_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    12841291 

  • juggler/trunk/modules/vapor/configure.ac

    r19729 r19745  
    967967fi 
    968968 
     969# In Autoconf 2.60, datadir has been renamed to datarootdir. 
     970if test "x$datarootdir" != "x" ; then 
     971   data_var="$datarootdir" 
     972else 
     973   data_var="$datadir" 
     974fi 
    969975 
    970976# Make a best-effort attempt to extract the actual share directory from the 
    …… 
    972978# all cases.  A person would have to be doing something malicious or foolish 
    973979# to make it break. 
    974 data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
     980data_subdir=`echo "$data_var" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    975981VPR_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    976982 

  • juggler/trunk/modules/vrjuggler/configure.ac

    r19729 r19745  
    566566fi 
    567567 
     568# In Autoconf 2.60, datadir has been renamed to datarootdir. 
     569if test "x$datarootdir" != "x" ; then 
     570   data_var="$datarootdir" 
     571else 
     572   data_var="$datadir" 
     573fi 
     574 
    568575# Make a best-effort attempt to extract the actual share directory from the 
    569576# full installation prefix.  This is not foolproof, but it will work in almost 
    570577# all cases.  A person would have to be doing something malicious or foolish 
    571578# to make it break. 
    572 data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
     579data_subdir=`echo "$data_var" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    573580VJ_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    574581