summaryrefslogtreecommitdiff
path: root/itcl/iwidgets3.0.0/unix
diff options
context:
space:
mode:
Diffstat (limited to 'itcl/iwidgets3.0.0/unix')
-rw-r--r--itcl/iwidgets3.0.0/unix/Makefile.in20
-rwxr-xr-xitcl/iwidgets3.0.0/unix/configure35
-rw-r--r--itcl/iwidgets3.0.0/unix/configure.in8
3 files changed, 41 insertions, 22 deletions
diff --git a/itcl/iwidgets3.0.0/unix/Makefile.in b/itcl/iwidgets3.0.0/unix/Makefile.in
index 3bd06402a99..fab7ce5b66f 100644
--- a/itcl/iwidgets3.0.0/unix/Makefile.in
+++ b/itcl/iwidgets3.0.0/unix/Makefile.in
@@ -28,6 +28,12 @@ VERSION = $(ITCL_VERSION).$(IWIDGETS_VERSION)
prefix = @prefix@
exec_prefix = @exec_prefix@
+srcdir = @srcdir@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+mandir=@mandir@
+datadir=@datadir@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
@@ -40,23 +46,23 @@ INSTALL_ROOT =
# Directory from which applications will reference the library of
# [incr Widgets] scripts (note: you can set the IWIDGETS_LIBRARY environment
# variable at run-time to override this value):
-IWIDGETS_LIBRARY = $(prefix)/share/iwidgets$(VERSION)
+IWIDGETS_LIBRARY = $(datadir)/iwidgets$(VERSION)
# END CYGNUS LOCAL
# Path name to use when installing library scripts:
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(IWIDGETS_LIBRARY)
# Directory in which to install the archive libtcl.a:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the program tclsh:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include file itcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
# Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
# Directory in which to install manual entry for itclsh:
MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
@@ -150,7 +156,9 @@ standalone:
plusplus:
-install: install-libraries install-demos install-man
+install: install-libraries install-demos install-man install-binaries
+
+install-binaries:
install-libraries:
@$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
diff --git a/itcl/iwidgets3.0.0/unix/configure b/itcl/iwidgets3.0.0/unix/configure
index 41e014586be..b0a4750fa47 100755
--- a/itcl/iwidgets3.0.0/unix/configure
+++ b/itcl/iwidgets3.0.0/unix/configure
@@ -37,6 +37,7 @@ program_suffix=NONE
program_transform_name=s,x,x,
silent=
site=
+sitefile=
srcdir=
target=NONE
verbose=
@@ -151,6 +152,7 @@ Configuration:
--help print this message
--no-create do not create output files
--quiet, --silent do not print \`checking...' messages
+ --site-file=FILE use FILE as the site file
--version print the version of autoconf that created configure
Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX
@@ -321,6 +323,11 @@ EOF
-site=* | --site=* | --sit=*)
site="$ac_optarg" ;;
+ -site-file | --site-file | --site-fil | --site-fi | --site-f)
+ ac_prev=sitefile ;;
+ -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+ sitefile="$ac_optarg" ;;
+
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
@@ -486,12 +493,16 @@ fi
srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+if test -z "$sitefile"; then
+ if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ else
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ fi
fi
+else
+ CONFIG_SITE="$sitefile"
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
@@ -568,7 +579,7 @@ echo $ac_n "checking for prefix by $ac_c" 1>&6
# Extract the first word of "tclsh", so it can be a program name with args.
set dummy tclsh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:572: checking for $ac_word" >&5
+echo "configure:583: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -625,7 +636,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:629: checking for a BSD compatible install" >&5
+echo "configure:640: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -680,7 +691,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:684: checking for $ac_word" >&5
+echo "configure:695: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -729,7 +740,7 @@ fi
TCL_LIB_DIR=""
-for dir in $exec_prefix/lib $itcl_search ; do
+for dir in $itcl_search $exec_prefix/lib ; do
if test -r $dir/tclConfig.sh; then
TCL_LIB_DIR=$dir
break
@@ -757,7 +768,7 @@ fi
TK_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
if test -r $dir/tkConfig.sh; then
TK_LIB_DIR=$dir
break
@@ -784,7 +795,7 @@ fi
ITCL_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
if test -r $dir/itclConfig.sh; then
ITCL_LIB_DIR=$dir
break
@@ -811,7 +822,7 @@ fi
ITK_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
if test -r $dir/itkConfig.sh; then
ITK_LIB_DIR=$dir
break
diff --git a/itcl/iwidgets3.0.0/unix/configure.in b/itcl/iwidgets3.0.0/unix/configure.in
index 43b8476eb43..58457f06097 100644
--- a/itcl/iwidgets3.0.0/unix/configure.in
+++ b/itcl/iwidgets3.0.0/unix/configure.in
@@ -45,7 +45,7 @@ AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.0 binaries from DIR],
itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tcl*/unix`)
TCL_LIB_DIR=""
-for dir in $exec_prefix/lib $itcl_search ; do
+for dir in $itcl_search $exec_prefix/lib ; do
if test -r $dir/tclConfig.sh; then
TCL_LIB_DIR=$dir
break
@@ -67,7 +67,7 @@ AC_ARG_WITH(tk, [ --with-tk=DIR use Tk 8.0 binaries from DIR],
itcl_search=$withval, itcl_search=`cd ../../..; ls -d \`pwd\`/tk*/unix`)
TK_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
if test -r $dir/tkConfig.sh; then
TK_LIB_DIR=$dir
break
@@ -88,7 +88,7 @@ AC_ARG_WITH(itcl, [ --with-itcl=DIR use Itcl 3.0 binaries from DIR],
itcl_search=$withval, itcl_search=`cd ${BUILD_DIR}/../../itcl; pwd`)
ITCL_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
if test -r $dir/itclConfig.sh; then
ITCL_LIB_DIR=$dir
break
@@ -109,7 +109,7 @@ AC_ARG_WITH(itk, [ --with-itk=DIR use Itk 3.0 binaries from DIR],
itcl_search=$withval, itcl_search=`cd ${BUILD_DIR}/../../itk; pwd`)
ITK_LIB_DIR=""
-for dir in $exec_prefix/lib $TCL_LIB_DIR $itcl_search ; do
+for dir in $itcl_search $TCL_LIB_DIR $exec_prefix/lib ; do
if test -r $dir/itkConfig.sh; then
ITK_LIB_DIR=$dir
break
View Lorry Controller Status