Changeset 530 for trunk


Ignore:
Timestamp:
Sep 21, 2006, 8:53:10 PM (18 years ago)
Author:
dkearney
Message:

a few changes to the configure script so we can generate the makefile before installing rappture to the --prefix directory. these changes should be reversed or made correct at some point when i figure out how to build these bindings as packages.

Location:
trunk/src/tcl
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/tcl/configure

    r528 r530  
    863863  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    864864  --with-blt=DIR          Find bltInt.h in DIR
    865   --with-rappture=DIR          Find include/rappture.h in DIR
    866   --with-altpath=DIR          Alternate path to search for required packages
    867865  --with-tcl              directory containing tcl configuration
    868866                          (tclConfig.sh)
    … …  
    14751473fi;
    14761474
    1477 
    1478 # Check whether --with-rappture or --without-rappture was given.
    1479 if test "${with_rappture+set}" = set; then
    1480   withval="$with_rappture"
    1481   rappture_dir=$withval
    1482 fi;
    1483 
    1484 
    1485 # Check whether --with-altpath or --without-altpath was given.
    1486 if test "${with_altpath+set}" = set; then
    1487   withval="$with_altpath"
    1488   alt_dir=$withval
    1489 fi;
     1475# AC_ARG_WITH(rappture, [  --with-rappture=DIR          Find include/rappture.h in DIR],
     1476#   rappture_dir=$withval)
     1477
     1478# AC_ARG_WITH(altpath, [  --with-altpath=DIR          Alternate path to search for required packages],
     1479#   alt_dir=$withval)
    14901480
    14911481#--------------------------------------------------------------------
    … …  
    1011310103# for it in the --with-rappture directory.
    1011410104#--------------------------------------------------------------------
    10115 echo "$as_me:$LINENO: checking for rappture.h" >&5
    10116 echo $ECHO_N "checking for rappture.h... $ECHO_C" >&6
    10117 RAPPTURE_DIR=""
    10118 if test "x$rappture_dir" != "x" ; then
    10119   #
    10120   # Verify that a rappture.h file exists in the directory specified
    10121   # by --with-rappture.
    10122   #
    10123   if test -r "$rappture_dir/include/rappture.h" ; then
    10124     RAPPTURE_DIR="$rappture_dir"
    10125   fi
    10126 else
    10127   #
    10128   # Otherwise, search for the rappture.h include file...
    10129   # 1. Search previously named locations.
    10130   #
    10131   for dir in \
    10132    $prefix \
    10133    $exec_prefix
    10134   do
    10135     if test -r "$dir/include/rappture.h" ; then
    10136       RAPPTURE_DIR="$dir"
    10137       break
    10138     fi
    10139   done
    10140   #
    10141   #  2. Search source directories.
    10142   #
    10143   if test "x$RAPPTURE_DIR" = "x" ; then
    10144     for dir in \
    10145      `ls -dr ../rappture 2>/dev/null` \
    10146      `ls -dr ../../rappture 2>/dev/null` \
    10147      `ls -dr ../../../rappture 2>/dev/null` \
    10148      `ls -dr C\:/opt/rappture 2>/dev/null` \
    10149      `ls -dr /opt/rappture 2>/dev/null`
    10150     do
    10151       if test -r "$dir/include/rappture.h" ; then
    10152         RAPPTURE_DIR="$dir"
    10153         break
    10154       fi
    10155     done
    10156   fi
    10157 fi
    10158 echo "$as_me:$LINENO: result: ${RAPPTURE_DIR}" >&5
    10159 echo "${ECHO_T}${RAPPTURE_DIR}" >&6
    10160 
    10161 if test "x$RAPPTURE_DIR" = "x" ; then
    10162   echo "can't find RAPPTURE include file \"rappture.h\""
    10163   echo "use --with-rappture=DIR to specify the location of rappture"
    10164   exit 1
    10165 fi
     10105RAPPTURE_DIR=$prefix
     10106# AC_MSG_CHECKING([for rappture.h])
     10107# RAPPTURE_DIR=""
     10108# if test "x$rappture_dir" != "x" ; then
     10109#   #
     10110#   # Verify that a rappture.h file exists in the directory specified
     10111#   # by --with-rappture.
     10112#   #
     10113#   if test -r "$rappture_dir/include/rappture.h" ; then
     10114#     RAPPTURE_DIR="$rappture_dir"
     10115#   fi
     10116# else
     10117#   #
     10118#   # Otherwise, search for the rappture.h include file...
     10119#   # 1. Search previously named locations.
     10120#   #
     10121#   for dir in \
     10122#    $prefix \
     10123#    $exec_prefix
     10124#   do
     10125#     if test -r "$dir/include/rappture.h" ; then
     10126#       RAPPTURE_DIR="$dir"
     10127#       break
     10128#     fi
     10129#   done
     10130#   #
     10131#   #  2. Search source directories.
     10132#   #
     10133#   if test "x$RAPPTURE_DIR" = "x" ; then
     10134#     for dir in \
     10135#      `ls -dr ../rappture 2>/dev/null` \
     10136#      `ls -dr ../../rappture 2>/dev/null` \
     10137#      `ls -dr ../../../rappture 2>/dev/null` \
     10138#      `ls -dr C\:/opt/rappture 2>/dev/null` \
     10139#      `ls -dr /opt/rappture 2>/dev/null`
     10140#     do
     10141#       if test -r "$dir/include/rappture.h" ; then
     10142#         RAPPTURE_DIR="$dir"
     10143#         break
     10144#       fi
     10145#     done
     10146#   fi
     10147# fi
     10148# AC_MSG_RESULT([${RAPPTURE_DIR}])
     10149#
     10150# if test "x$RAPPTURE_DIR" = "x" ; then
     10151#   echo "can't find RAPPTURE include file \"rappture.h\""
     10152#   echo "use --with-rappture=DIR to specify the location of rappture"
     10153#   exit 1
     10154# fi
    1016610155
    1016710156
    … …  
    1017110160# for it in the --with-scew directory.
    1017210161#--------------------------------------------------------------------
    10173 echo "$as_me:$LINENO: checking for alternate paths" >&5
    10174 echo $ECHO_N "checking for alternate paths... $ECHO_C" >&6
    10175 ALT_DIR=""
    10176 if test "x$alt_dir" != "x" ; then
    10177   #
    10178   # Verify that a include and lib directories exist in the directory specified
    10179   # by --with-altpath.
    10180   #
    10181   if test -d "$alt_dir/include" -a -d "$alt_dir/lib" ; then
    10182     ALT_DIR="$rappture_dir"
    10183   fi
    10184 else
    10185   if test "x$ALT_DIR" = "x" ; then
    10186     for dir in \
    10187      C\:/opt /opt
    10188     do
    10189       if test -r "$dir/include" -a -d "$dir/lib" ; then
    10190         ALT_DIR="$dir"
    10191         break
    10192       fi
    10193     done
    10194   fi
    10195 fi
    10196 if test "x$ALT_DIR" = "x" ; then
    10197     echo "$as_me:$LINENO: result: none" >&5
    10198 echo "${ECHO_T}none" >&6
    10199   else
    10200     echo "$as_me:$LINENO: result: ${ALT_DIR}" >&5
    10201 echo "${ECHO_T}${ALT_DIR}" >&6
    10202 fi
    10203 
     10162# AC_MSG_CHECKING([for alternate paths])
     10163# ALT_DIR=""
     10164# if test "x$alt_dir" != "x" ; then
     10165#   #
     10166#   # Verify that a include and lib directories exist in the directory specified
     10167#   # by --with-altpath.
     10168#   #
     10169#   if test -d "$alt_dir/include" -a -d "$alt_dir/lib" ; then
     10170#     ALT_DIR="$rappture_dir"
     10171#   fi
     10172# else
     10173#   if test "x$ALT_DIR" = "x" ; then
     10174#     for dir in \
     10175#      C\:/opt /opt
     10176#     do
     10177#       if test -r "$dir/include" -a -d "$dir/lib" ; then
     10178#         ALT_DIR="$dir"
     10179#         break
     10180#       fi
     10181#     done
     10182#   fi
     10183# fi
     10184# if test "x$ALT_DIR" = "x" ; then
     10185#     AC_MSG_RESULT(none)
     10186#   else
     10187#     AC_MSG_RESULT([${ALT_DIR}])
     10188# fi
     10189#
    1020410190
    1020510191

  • trunk/src/tcl/configure.in

    r528 r530  
    3838  blt_source_dir=$withval)
    3939
    40 AC_ARG_WITH(rappture, [  --with-rappture=DIR          Find include/rappture.h in DIR],
    41   rappture_dir=$withval)
    42 
    43 AC_ARG_WITH(altpath, [  --with-altpath=DIR          Alternate path to search for required packages],
    44   alt_dir=$withval)
     40# AC_ARG_WITH(rappture, [  --with-rappture=DIR          Find include/rappture.h in DIR],
     41#   rappture_dir=$withval)
     42
     43# AC_ARG_WITH(altpath, [  --with-altpath=DIR          Alternate path to search for required packages],
     44#   alt_dir=$withval)
    4545
    4646#--------------------------------------------------------------------
    … …  
    264264# for it in the --with-rappture directory.
    265265#--------------------------------------------------------------------
    266 AC_MSG_CHECKING([for rappture.h])
    267 RAPPTURE_DIR=""
    268 if test "x$rappture_dir" != "x" ; then
    269   #
    270   # Verify that a rappture.h file exists in the directory specified
    271   # by --with-rappture.
    272   #
    273   if test -r "$rappture_dir/include/rappture.h" ; then
    274     RAPPTURE_DIR="$rappture_dir"
    275   fi
    276 else
    277   #
    278   # Otherwise, search for the rappture.h include file...
    279   # 1. Search previously named locations.
    280   #
    281   for dir in \
    282    $prefix \
    283    $exec_prefix
    284   do
    285     if test -r "$dir/include/rappture.h" ; then
    286       RAPPTURE_DIR="$dir"
    287       break
    288     fi
    289   done
    290   #
    291   #  2. Search source directories.
    292   #
    293   if test "x$RAPPTURE_DIR" = "x" ; then
    294     for dir in \
    295      `ls -dr ../rappture 2>/dev/null` \
    296      `ls -dr ../../rappture 2>/dev/null` \
    297      `ls -dr ../../../rappture 2>/dev/null` \
    298      `ls -dr C\:/opt/rappture 2>/dev/null` \
    299      `ls -dr /opt/rappture 2>/dev/null`
    300     do
    301       if test -r "$dir/include/rappture.h" ; then
    302         RAPPTURE_DIR="$dir"
    303         break
    304       fi
    305     done
    306   fi
    307 fi
    308 AC_MSG_RESULT([${RAPPTURE_DIR}])
    309 
    310 if test "x$RAPPTURE_DIR" = "x" ; then
    311   echo "can't find RAPPTURE include file \"rappture.h\""
    312   echo "use --with-rappture=DIR to specify the location of rappture"
    313   exit 1
    314 fi
     266RAPPTURE_DIR=$prefix
     267# AC_MSG_CHECKING([for rappture.h])
     268# RAPPTURE_DIR=""
     269# if test "x$rappture_dir" != "x" ; then
     270#   #
     271#   # Verify that a rappture.h file exists in the directory specified
     272#   # by --with-rappture.
     273#   #
     274#   if test -r "$rappture_dir/include/rappture.h" ; then
     275#     RAPPTURE_DIR="$rappture_dir"
     276#   fi
     277# else
     278#   #
     279#   # Otherwise, search for the rappture.h include file...
     280#   # 1. Search previously named locations.
     281#   #
     282#   for dir in \
     283#    $prefix \
     284#    $exec_prefix
     285#   do
     286#     if test -r "$dir/include/rappture.h" ; then
     287#       RAPPTURE_DIR="$dir"
     288#       break
     289#     fi
     290#   done
     291#   #
     292#   #  2. Search source directories.
     293#   #
     294#   if test "x$RAPPTURE_DIR" = "x" ; then
     295#     for dir in \
     296#      `ls -dr ../rappture 2>/dev/null` \
     297#      `ls -dr ../../rappture 2>/dev/null` \
     298#      `ls -dr ../../../rappture 2>/dev/null` \
     299#      `ls -dr C\:/opt/rappture 2>/dev/null` \
     300#      `ls -dr /opt/rappture 2>/dev/null`
     301#     do
     302#       if test -r "$dir/include/rappture.h" ; then
     303#         RAPPTURE_DIR="$dir"
     304#         break
     305#       fi
     306#     done
     307#   fi
     308# fi
     309# AC_MSG_RESULT([${RAPPTURE_DIR}])
     310#
     311# if test "x$RAPPTURE_DIR" = "x" ; then
     312#   echo "can't find RAPPTURE include file \"rappture.h\""
     313#   echo "use --with-rappture=DIR to specify the location of rappture"
     314#   exit 1
     315# fi
    315316
    316317AC_SUBST(RAPPTURE_DIR)
    … …  
    320321# for it in the --with-scew directory.
    321322#--------------------------------------------------------------------
    322 AC_MSG_CHECKING([for alternate paths])
    323 ALT_DIR=""
    324 if test "x$alt_dir" != "x" ; then
    325   #
    326   # Verify that a include and lib directories exist in the directory specified
    327   # by --with-altpath.
    328   #
    329   if test -d "$alt_dir/include" -a -d "$alt_dir/lib" ; then
    330     ALT_DIR="$rappture_dir"
    331   fi
    332 else
    333   if test "x$ALT_DIR" = "x" ; then
    334     for dir in \
    335      C\:/opt /opt
    336     do
    337       if test -r "$dir/include" -a -d "$dir/lib" ; then
    338         ALT_DIR="$dir"
    339         break
    340       fi
    341     done
    342   fi
    343 fi
    344 if test "x$ALT_DIR" = "x" ; then
    345     AC_MSG_RESULT(none)
    346   else
    347     AC_MSG_RESULT([${ALT_DIR}])
    348 fi
    349 
     323# AC_MSG_CHECKING([for alternate paths])
     324# ALT_DIR=""
     325# if test "x$alt_dir" != "x" ; then
     326#   #
     327#   # Verify that a include and lib directories exist in the directory specified
     328#   # by --with-altpath.
     329#   #
     330#   if test -d "$alt_dir/include" -a -d "$alt_dir/lib" ; then
     331#     ALT_DIR="$rappture_dir"
     332#   fi
     333# else
     334#   if test "x$ALT_DIR" = "x" ; then
     335#     for dir in \
     336#      C\:/opt /opt
     337#     do
     338#       if test -r "$dir/include" -a -d "$dir/lib" ; then
     339#         ALT_DIR="$dir"
     340#         break
     341#       fi
     342#     done
     343#   fi
     344# fi
     345# if test "x$ALT_DIR" = "x" ; then
     346#     AC_MSG_RESULT(none)
     347#   else
     348#     AC_MSG_RESULT([${ALT_DIR}])
     349# fi
     350#
    350351AC_SUBST(ALT_DIR)
    351352
Note: See TracChangeset for help on using the changeset viewer.