Changeset 19100

Show
Ignore:
Timestamp:
08/03/06 09:12:28 (2 years ago)
Author:
dshipton
Message:

Magic glue that uses flagpoll now for setting up tweek.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/macros/tweek.m4

    r18824 r19100  
    3131[ 
    3232    dnl Get the cflags and libraries from the tweek-config script 
    33     AC_ARG_WITH(tweek, 
    34                 [  --with-tweek=<PATH>     Directory where Tweek is 
    35                           installed                       [No default]], 
    36                 tweek_config_prefix="$withval", tweek_config_prefix="") 
    37     AC_ARG_WITH(tweek-exec-prefix, 
    38                 [  --with-tweek-exec-prefix=<PATH> 
    39                           Exec prefix where Tweek is 
    40                           installed (optional)            [No default]], 
    41                 tweek_config_exec_prefix="$withval", 
    42                 tweek_config_exec_prefix="") 
    43  
    44     if test "x$tweek_config_exec_prefix" != "x" ; then 
    45         tweek_config_args="$tweek_config_args --exec-prefix=$tweek_config_exec_prefix" 
    46  
    47         if test x${TWEEK_CONFIG+set} != xset ; then 
    48             TWEEK_CONFIG="$tweek_config_exec_prefix/bin/tweek-config" 
    49         fi 
     33    AC_ARG_WITH(tweek-meta-file, 
     34                [  --with-tweek-meta-file=<PATH>     Flagpoll metadata file 
     35                          for VPR                       [No default]], 
     36                tweek_meta_file="$withval", tweek_meta_file="") 
     37 
     38    dnl See if the user specified where to find vapor 
     39    dnl if they didn't take a guess for them 
     40    if test "x$tweek_meta_file" != "x" ; then 
     41        tweek_flagpoll_args="--from-file=$tweek_meta_file" 
     42    else 
     43        tweek_flagpoll_args="--from-file=$instlinks/share/flagpoll/tweek.fpc" 
    5044    fi 
    5145 
    52     if test "x$tweek_config_prefix" != "x" ; then 
    53         tweek_config_args="$tweek_config_args --prefix=$tweek_config_prefix" 
    54  
    55         if test x${TWEEK_CONFIG+set} != xset ; then 
    56             TWEEK_CONFIG="$tweek_config_prefix/bin/tweek-config" 
    57         fi 
    58     fi 
    59  
    60     if test "x$TWEEK_BASE_DIR" != "x" ; then 
    61         tweek_config_args="$tweek_config_args --prefix=$TWEEK_BASE_DIR" 
    62  
    63         if test x${TWEEK_CONFIG+set} != xset ; then 
    64             TWEEK_CONFIG="$TWEEK_BASE_DIR/bin/tweek-config" 
    65         fi 
    66     fi 
    67  
    68     AC_PATH_PROG(TWEEK_CONFIG, tweek-config, no) 
    69  
    70     dnl Do a sanity check to ensure that $TWEEK_CONFIG actually works. 
    71     if ! (eval $TWEEK_CONFIG --cxxflags >/dev/null 2>&1) 2>&1 ; then 
    72         TWEEK_CONFIG='no' 
     46    tweek_flagpoll_args="tweek $tweek_flagpoll_args --no-deps" 
     47 
     48    AC_PATH_PROG(FLAGPOLL, flagpoll, no) 
     49 
     50    dnl Do a sanity check to ensure that $FLAGPOLL actually works. 
     51    if ! (eval $FLAGPOLL --help >/dev/null 2>&1) 2>&1 ; then 
     52        FLAGPOLL='no' 
    7353        echo "*** The tweek-config script installed by Tweek could not be found" 
    7454        echo "*** If Tweek was installed in PREFIX, make sure PREFIX/bin is in" 
    …… 
    8666   DPP_PREREQ([2.0.1]) 
    8767 
    88    if test "x$TWEEK_CONFIG" = "x" ; then 
     68   if test "x$tweek_flagpoll_args" = "x" ; then 
    8969      _TWEEK_PATH_SETUP() 
    9070   fi 
    9171 
    92    if test "x$TWEEK_CONFIG" = "xno" ; then 
     72   if test "x$FLAGPOLL" = "xno" ; then 
    9373      ifelse([$3], , :, [$3]) 
    9474   else 
    95       TWEEK_VERSION=`$TWEEK_CONFIG --version` 
     75      TWEEK_VERSION=`$FLAGPOLL $tweek_flagpoll_args --modversion` 
    9676 
    9777      min_tweek_version=ifelse([$1], , 0.0.1, $1) 
    …… 
    10686dnl Tests for Tweek C++ API and then defines the following variables: 
    10787dnl     TWEEK_CXXFLAGS 
    108 dnl     TWEEK_CXXFLAGS_MIN 
    109 dnl     TWEEK_INCLUDES 
    110 dnl     TWEEK_INCLUDES_MIN 
    111 dnl     TWEEK_LIBS_LD 
    112 dnl     TWEEK_LIBS_LD_MIN 
    113 dnl     TWEEK_LIBS_STATIC_LD 
    114 dnl     TWEEK_LIBS_STATIC_LD_MIN 
    115 dnl     TWEEK_LIBS_CC 
    116 dnl     TWEEK_LIBS_CC_MIN 
    117 dnl     TWEEK_LIBS_STATIC_CC 
    118 dnl     TWEEK_LIBS_STATIC_CC_MIN 
    119 dnl     TWEEK_PROF_LIBS_LD 
    120 dnl     TWEEK_PROF_LIBS_LD_MIN 
    121 dnl     TWEEK_PROF_LIBS_STATIC_LD 
    122 dnl     TWEEK_PROF_LIBS_STATIC_LD_MIN 
    123 dnl     TWEEK_PROF_LIBS_CC 
    124 dnl     TWEEK_PROF_LIBS_CC_MIN 
    125 dnl     TWEEK_PROF_LIBS_STATIC_CC 
    126 dnl     TWEEK_PROF_LIBS_STATIC_CC_MIN 
     88dnl     TWEEK_LIBS 
     89dnl     TWEEK_LIBS_STATIC 
     90dnl     TWEEK_PROF_LIBS 
     91dnl     TWEEK_PROF_LIBS_STATIC 
    12792dnl     TWEEK_CXX_IDL 
    12893dnl     TWEEK_CXX_IDL_OPTS 
    …… 
    13196AC_DEFUN([TWEEK_PATH_CXX], 
    13297[ 
    133    if test "x$TWEEK_CONFIG" = "x" ; then 
     98   if test "x$tweek_flagpoll_args" = "x" ; then 
    13499      _TWEEK_PATH_SETUP() 
    135100   fi 
    136101 
    137102   TWEEK_CXXFLAGS="" 
    138    TWEEK_CXXFLAGS_MIN="" 
    139    TWEEK_INCLUDES="" 
    140    TWEEK_INCLUDES_MIN="" 
    141    TWEEK_LIBS_LD="" 
    142    TWEEK_LIBS_LD_MIN="" 
    143    TWEEK_LIBS_STATIC_LD="" 
    144    TWEEK_LIBS_STATIC_LD_MIN="" 
    145    TWEEK_LIBS_CC="" 
    146    TWEEK_LIBS_CC_MIN="" 
    147    TWEEK_LIBS_STATIC_CC="" 
    148    TWEEK_LIBS_STATIC_CC_MIN="" 
    149    TWEEK_PROF_LIBS_LD="" 
    150    TWEEK_PROF_LIBS_LD_MIN="" 
    151    TWEEK_PROF_LIBS_STATIC_LD="" 
    152    TWEEK_PROF_LIBS_STATIC_LD_MIN="" 
    153    TWEEK_PROF_LIBS_CC="" 
    154    TWEEK_PROF_LIBS_CC_MIN="" 
    155    TWEEK_PROF_LIBS_STATIC_CC="" 
    156    TWEEK_PROF_LIBS_STATIC_CC_MIN="" 
     103   TWEEK_LIBS="" 
     104   TWEEK_LIBS_STATIC="" 
     105   TWEEK_PROF_LIBS="" 
     106   TWEEK_PROF_LIBS_STATIC="" 
    157107   TWEEK_CXX_IDL="" 
    158108   TWEEK_CXX_IDL_OPTS="" 
    …… 
    160110   TWEEK_CXX_IDL_INCFLAG="" 
    161111 
    162    if test "x$TWEEK_CONFIG" = "xno" ; then 
     112   if test "x$FLAGPOLL" = "xno" ; then 
    163113      ifelse([$3], , :, [$3]) 
    164114   else 
    165115      AC_MSG_CHECKING([whether Tweek C++ API is available]) 
    166       has_cxx=`$TWEEK_CONFIG --too-much-pressure` 
     116      has_cxx=`$FLAGPOLL $tweek_flagpoll_args --get-cxx-api-available` 
    167117 
    168118      if test "x$has_cxx" = "xY" ; then 
    …… 
    175125 
    176126         if test "x$tweek_version_okay" = "xyes" ; then 
    177             TWEEK_CXXFLAGS=`$TWEEK_CONFIG $tweek_config_args --cxxflags $ABI` 
    178             TWEEK_INCLUDES=`$TWEEK_CONFIG $tweek_config_args --includes` 
    179             TWEEK_EXTRA_LIBS_CC=`$TWEEK_CONFIG $tweek_config_args --extra-libs $ABI` 
    180             TWEEK_EXTRA_LIBS_LD=`$TWEEK_CONFIG $tweek_config_args --extra-libs $ABI --linker` 
    181             TWEEK_LIBS_CC=`$TWEEK_CONFIG $tweek_config_args --libs $ABI` 
    182             TWEEK_LIBS_LD=`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker` 
    183             TWEEK_PROF_LIBS_CC=`$TWEEK_CONFIG $tweek_config_args --libs $ABI --profiled` 
    184             TWEEK_PROF_LIBS_LD=`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker --profiled` 
    185             TWEEK_LIBS_STATIC_CC=`$TWEEK_CONFIG $tweek_config_args --libs $ABI --static` 
    186             TWEEK_LIBS_STATIC_LD=`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker --static` 
    187             TWEEK_PROF_LIBS_STATIC_CC=`$TWEEK_CONFIG $tweek_config_args --libs $ABI --static --profiled` 
    188             TWEEK_PROF_LIBS_STATIC_LD=`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker --static --profiled` 
    189  
    190             TWEEK_CXX_IDL="`$TWEEK_CONFIG $tweek_config_args --idl cxx`" 
    191             TWEEK_CXX_IDL_OPTS="`$TWEEK_CONFIG $tweek_config_args --idlflags cxx`" 
    192             TWEEK_CXX_IDL_GENDIR_OPT="`$TWEEK_CONFIG $tweek_config_args --idlgendir cxx`" 
    193             TWEEK_CXX_IDL_INCFLAG="`$TWEEK_CONFIG $tweek_config_args --idlincflag cxx`" 
    194  
    195             TWEEK_CXXFLAGS_MIN=`$TWEEK_CONFIG $tweek_config_args --cxxflags $ABI --min` 
    196             TWEEK_INCLUDES_MIN=`$TWEEK_CONFIG $tweek_config_args --includes --min` 
    197             TWEEK_EXTRA_LIBS_CC_MIN=`$TWEEK_CONFIG $tweek_config_args --extra-libs $ABI --min` 
    198             TWEEK_EXTRA_LIBS_LD_MIN=`$TWEEK_CONFIG $tweek_config_args --extra-libs $ABI --linker --min` 
    199             TWEEK_LIBS_CC_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --min`" 
    200             TWEEK_LIBS_LD_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker --min`" 
    201             TWEEK_PROF_LIBS_CC_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --min --profiled`" 
    202             TWEEK_PROF_LIBS_LD_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker --min --profiled`" 
    203             TWEEK_LIBS_STATIC_CC_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --static --min`" 
    204             TWEEK_LIBS_STATIC_LD_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker --static --min`" 
    205             TWEEK_PROF_LIBS_STATIC_CC_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --static --min --profiled`" 
    206             TWEEK_PROF_LIBS_STATIC_LD_MIN="`$TWEEK_CONFIG $tweek_config_args --libs $ABI --linker --static --min --profiled`" 
     127            TWEEK_CXXFLAGS=`$FLAGPOLL $tweek_flagpoll_args --cflags` 
     128            TWEEK_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-libs` 
     129            TWEEK_EXTRA_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-extra-libs` 
     130            TWEEK_PROF_LIBS=`$FLAGPOLL $tweek_flagpoll_args --get-profiled_libs` 
     131            TWEEK_LIBS_STATIC=`$FLAGPOLL $tweek_flagpoll_args --get-static-libs` 
     132            TWEEK_PROF_LIBS_STATIC_LD=`$FLAGPOLL $tweek_flagpoll_args --get-profiled-static-libs` 
     133 
     134            TWEEK_CXX_IDL="`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idl`" 
     135            TWEEK_CXX_IDL_OPTS="`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlflags`" 
     136            TWEEK_CXX_IDL_GENDIR_OPT="`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlgendir`" 
     137            TWEEK_CXX_IDL_INCFLAG="`$FLAGPOLL $tweek_flagpoll_args --get-cxx-idlincflag`" 
    207138 
    208139            ifelse([$2], , :, [$2]) 
    …… 
    215146 
    216147   AC_SUBST([TWEEK_CXXFLAGS]) 
    217    AC_SUBST([TWEEK_LIBS_CC]) 
    218    AC_SUBST([TWEEK_LIBS_LD]) 
    219    AC_SUBST([TWEEK_PROF_LIBS_CC]) 
    220    AC_SUBST([TWEEK_PROF_LIBS_LD]) 
    221    AC_SUBST([TWEEK_LIBS_STATIC_LD]) 
    222    AC_SUBST([TWEEK_LIBS_STATIC_CC]) 
    223    AC_SUBST([TWEEK_PROF_LIBS_STATIC_LD]) 
    224    AC_SUBST([TWEEK_PROF_LIBS_STATIC_CC]) 
     148   AC_SUBST([TWEEK_LIBS]) 
     149   AC_SUBST([TWEEK_PROF_LIBS]) 
     150   AC_SUBST([TWEEK_LIBS_STATIC]) 
     151   AC_SUBST([TWEEK_PROF_LIBS_STATIC]) 
    225152 
    226153   AC_SUBST([TWEEK_CXX_IDL]) 
    …… 
    229156   AC_SUBST([TWEEK_CXX_IDL_INCFLAG]) 
    230157 
    231    AC_SUBST([TWEEK_CXXFLAGS_MIN]) 
    232    AC_SUBST([TWEEK_INCLUDES_MIN]) 
    233    AC_SUBST([TWEEK_LIBS_CC_MIN]) 
    234    AC_SUBST([TWEEK_LIBS_LD_MIN]) 
    235    AC_SUBST([TWEEK_PROF_LIBS_CC_MIN]) 
    236    AC_SUBST([TWEEK_PROF_LIBS_LD_MIN]) 
    237    AC_SUBST([TWEEK_LIBS_STATIC_CC_MIN]) 
    238    AC_SUBST([TWEEK_LIBS_STATIC_LD_MIN]) 
    239    AC_SUBST([TWEEK_PROF_LIBS_STATIC_CC_MIN]) 
    240    AC_SUBST([TWEEK_PROF_LIBS_STATIC_LD_MIN]) 
    241158]) 
    242159 
    …… 
    253170AC_DEFUN([TWEEK_PATH_JAVA], 
    254171[ 
    255    if test "x$TWEEK_CONFIG" = "x" ; then 
     172   if test "x$tweek_flagpoll_args" = "x" ; then 
    256173      _TWEEK_PATH_SETUP() 
    257174   fi 
    …… 
    264181   TWEEK_EXT_JARS='' 
    265182 
    266    if test "x$TWEEK_CONFIG" = "xno" ; then 
     183   if test "x$FLAGPOLL" = "xno" ; then 
    267184      ifelse([$3], , :, [$3]) 
    268185   else 
    269186      AC_MSG_CHECKING([whether Tweek Java API is available]) 
    270       has_java=`$TWEEK_CONFIG --is-jittery` 
     187      has_java=`$FLAGPOLL $tweek_flagpoll_args --get-java-api-available` 
    271188 
    272189      if test "x$has_java" = "xY" ; then 
    …… 
    279196 
    280197         if test "x$tweek_version_okay" = "xyes" ; then 
    281             TWEEK_JAVA_IDL="`$TWEEK_CONFIG $tweek_config_args --idl java`" 
    282             TWEEK_JAVA_IDL_OPTS="`$TWEEK_CONFIG $tweek_config_args --idlflags java`" 
    283             TWEEK_JAVA_IDL_GENDIR_OPT="`$TWEEK_CONFIG $tweek_config_args --idlgendir java`" 
    284             TWEEK_JAVA_IDL_INCFLAG="`$TWEEK_CONFIG $tweek_config_args --idlincflag java`" 
    285             TWEEK_JARS="`$TWEEK_CONFIG $tweek_config_args --jars`" 
    286             TWEEK_EXT_JARS="`$TWEEK_CONFIG $tweek_config_args --ext-jars`" 
     198            TWEEK_JAVA_IDL="`$FLAGPOLL $tweek_flagpoll_args --get-java-idl`" 
     199            TWEEK_JAVA_IDL_OPTS="`$FLAGPOLL $tweek_flagpoll_args --get-java-idlflags`" 
     200            TWEEK_JAVA_IDL_GENDIR_OPT="`$FLAGPOLL $tweek_flagpoll_args --get-java-idlgendir`" 
     201            TWEEK_JAVA_IDL_INCFLAG="`$FLAGPOLL $tweek_flagpoll_args --get-java-idlincflag`" 
     202            TWEEK_JARS="`$FLAGPOLL $tweek_flagpoll_args --get-jars`" 
     203            TWEEK_EXT_JARS="`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars`" 
    287204 
    288205            ifelse([$2], , :, [$2]) 
    …… 
    313230AC_DEFUN([TWEEK_PATH_PYTHON], 
    314231[ 
    315    if test "x$TWEEK_CONFIG" = "x" ; then 
     232   if test "x$tweek_flagpoll_args" = "x" ; then 
    316233      _TWEEK_PATH_SETUP() 
    317234   fi 
    …… 
    322239   TWEEK_PYTHON_IDL_INCFLAG='' 
    323240 
    324    if test "x$TWEEK_CONFIG" = "xno" ; then 
     241   if test "x$FLAGPOLL" = "xno" ; then 
    325242      ifelse([$3], , :, [$3]) 
    326243   else 
    327244      AC_MSG_CHECKING([whether Tweek Python API is available]) 
    328       has_java=`$TWEEK_CONFIG --is-jittery` 
     245      has_java=`$FLAGPOLL $tweek_flagpoll_args --get-python-idl-available` 
    329246 
    330247      if test "x$has_java" = "xY" ; then 
    …… 
    337254 
    338255         if test "x$tweek_version_okay" = "xyes" ; then 
    339             TWEEK_PYTHON_IDL="`$TWEEK_CONFIG $tweek_config_args --idl java`" 
    340             TWEEK_PYTHON_IDL_OPTS="`$TWEEK_CONFIG $tweek_config_args --idlflags java`" 
    341             TWEEK_PYTHON_IDL_GENDIR_OPT="`$TWEEK_CONFIG $tweek_config_args --idlgendir java`" 
    342             TWEEK_PYTHON_IDL_INCFLAG="`$TWEEK_CONFIG $tweek_config_args --idlincflag java`" 
    343             TWEEK_JARS="`$TWEEK_CONFIG $tweek_config_args --jars`" 
    344             TWEEK_EXT_JARS="`$TWEEK_CONFIG $tweek_config_args --ext-jars`" 
     256            TWEEK_PYTHON_IDL="`$FLAGPOLL $tweek_flagpoll_args --get-python-idl`" 
     257            TWEEK_PYTHON_IDL_OPTS="`$FLAGPOLL $tweek_flagpoll_args ---get-python-idlflags`" 
     258            TWEEK_PYTHON_IDL_GENDIR_OPT="`$FLAGPOLL $tweek_flagpoll_args --get-python-idlgendir`" 
     259            TWEEK_PYTHON_IDL_INCFLAG="`$FLAGPOLL $tweek_flagpoll_args --get-python-idlincflag`" 
     260            TWEEK_JARS="`$FLAGPOLL $tweek_flagpoll_args --get-jars`" 
     261            TWEEK_EXT_JARS="`$FLAGPOLL $tweek_flagpoll_args --get-ext-jars`" 
    345262 
    346263            ifelse([$2], , :, [$2]) 
    …… 
    364281dnl variables: 
    365282dnl     TWEEK_CXXFLAGS 
    366 dnl     TWEEK_CXXFLAGS_MIN 
    367283dnl     TWEEK_LIBS_LD 
    368 dnl     TWEEK_LIBS_LD_MIN 
    369284dnl     TWEEK_LIBS_STATIC_LD 
    370 dnl     TWEEK_LIBS_STATIC_LD_MIN 
    371285dnl     TWEEK_LIBS_CC 
    372 dnl     TWEEK_LIBS_CC_MIN 
    373286dnl     TWEEK_LIBS_STATIC_CC 
    374 dnl     TWEEK_LIBS_STATIC_CC_MIN 
    375287dnl     TWEEK_CXX_IDL 
    376288dnl     TWEEK_CXX_IDL_OPTS