--enable-install-subdir option for ./configure, fixed mkdirhier.sh, trimmed config/site.def.<CPU> fi
Brought to you by:
johnston
Menu
▾
▴
--enable-install-subdir option for ./configure, fixed mkdirhier.sh, trimmed config/site.def.<CPU> files
|
From: <ivt...@li...> - 2000-01-21 23:22:32
|
Patch: ivtools-000122-johnston-014
For: ivtools-0.8
Author: joh...@us...
This is an intermediate patch to ivtools-0.8. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -p0 <ThisFile
Summary of Changes:
- add --enable-install-subdir argument to ./configure. This allows a
user to install in /usr/local/lib/ivtools and /usr/local/bin/ivtools
if they want (/usr/local can be changed with --prefix).
- change src/scripts/mkdirhier.sh to work with new versions of mkdir
that no longer accept multiple arguments.
- pare down the various config/site.def.$CPU files to the things
actually used/required. Take out all definitions provided by the
./configure script.
Index: top_ivtools/INSTALL
diff -c top_ivtools/INSTALL:1.2 top_ivtools/INSTALL:1.3
*** top_ivtools/INSTALL:1.2 Sat Jan 22 02:29:52 2000
--- ./INSTALL Sat Jan 22 02:29:52 2000
***************
*** 115,124 ****
--x-libraries=DIR X library files are in DIR
--enable-install-relative[=ARG] install relative to source tree
! --prefix=DIR to use when install-relative false
(default is /usr/local)
! --enable-use-rpath[=ARG] use -rpath when linking
ARG can be 0 or 1, default is 1 when not specified. The configure
script is usually able to automatically determine --x-includes and
--- 115,127 ----
--x-libraries=DIR X library files are in DIR
--enable-install-relative[=ARG] install relative to source tree
! --enable-install-subdir[=ARG] install in ivtools sub-directory
! --prefix=DIR to use when install-relative is false
(default is /usr/local)
! --enable-use-rpath[=ARG] use -rpath when linking, to
! embed shared-library pathnames
! in executable.
ARG can be 0 or 1, default is 1 when not specified. The configure
script is usually able to automatically determine --x-includes and
Index: top_ivtools/configure
diff -c top_ivtools/configure:1.1 top_ivtools/configure:1.2
*** top_ivtools/configure:1.1 Sat Jan 22 02:29:52 2000
--- ./configure Sat Jan 22 02:29:52 2000
***************
*** 31,36 ****
--- 31,38 ----
--enable-install-relative[=ARG] enable installation relative to the source tree"
ac_help="$ac_help
--enable-use-rpath[=ARG] enable use of -rpath when linking"
+ ac_help="$ac_help
+ --enable-install-subdir[=ARG] enable installation in an ivtools sub-directory"
# Initialize some variables set by options.
# The variables have the same names as the options, with
***************
*** 538,544 ****
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:571: checking host system type" >&5
host_alias=$host
case "$host_alias" in
--- 540,546 ----
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:573: checking host system type" >&5
host_alias=$host
case "$host_alias" in
***************
*** 802,808 ****
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:835: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 804,810 ----
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:837: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 833,839 ****
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:866: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--- 835,841 ----
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:868: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
***************
*** 843,853 ****
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
! #line 876 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
--- 845,855 ----
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
! #line 878 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
***************
*** 873,884 ****
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:906: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:911: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 875,886 ----
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:908: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:913: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 887,893 ****
yes;
#endif
EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
--- 889,895 ----
yes;
#endif
EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
***************
*** 902,908 ****
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:935: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 904,910 ----
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:937: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 933,939 ****
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:966: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 935,941 ----
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:968: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 962,968 ****
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:995: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 964,970 ----
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:997: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1010,1016 ****
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--- 1012,1018 ----
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1045: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
***************
*** 1020,1030 ****
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
! #line 1053 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
--- 1022,1032 ----
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
! #line 1055 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
! if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
***************
*** 1044,1055 ****
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1077: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1082: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1046,1057 ----
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1079: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1084: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1058,1064 ****
yes;
#endif
EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
--- 1060,1066 ----
yes;
#endif
EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
***************
*** 1073,1079 ****
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1106: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1075,1081 ----
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1108: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1102,1108 ****
# check for CPP
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:1135: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 1104,1110 ----
# check for CPP
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:1137: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1115,1126 ****
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
! #line 1148 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
--- 1117,1128 ----
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
! #line 1150 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
***************
*** 1148,1154 ****
# 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:1181: 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
--- 1150,1156 ----
# 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:1183: 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
***************
*** 1176,1182 ****
# check for X paths
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1209: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
--- 1178,1184 ----
# check for X paths
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1211: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
***************
*** 1191,1203 ****
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 1224 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
--- 1193,1205 ----
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 1226 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
***************
*** 1208,1220 ****
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 1241 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
--- 1210,1222 ----
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 1243 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
***************
*** 1241,1247 ****
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1274: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
--- 1243,1249 ----
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1276: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
***************
*** 1303,1314 ****
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
! #line 1336 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
--- 1305,1316 ----
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
! #line 1338 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
***************
*** 1377,1390 ****
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1410 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
! if { (eval echo configure:1417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
--- 1379,1392 ----
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1412 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
! if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
***************
*** 1476,1482 ****
#AC_CXX_HEADERS
echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6
! echo "configure:1509: checking for directory to install c++ include files" >&5
if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 1478,1484 ----
#AC_CXX_HEADERS
echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6
! echo "configure:1511: checking for directory to install c++ include files" >&5
if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 1584,1589 ****
--- 1586,1600 ----
fi
+ # Check whether --enable-install-subdir or --disable-install-subdir was given.
+ if test "${enable_install_subdir+set}" = set; then
+ enableval="$enable_install_subdir"
+ INSTALLSUBDIR=YES
+ else
+ INSTALLSUBDIR=NO
+ fi
+
+
#AC_SUBST(OPENGL)
#AC_SUBST(XGL)
***************
*** 1615,1620 ****
--- 1626,1632 ----
+
#output to config-$host_fragd
PWD=`pwd`; export PWD
trap '' 1 2 15
***************
*** 1791,1796 ****
--- 1803,1809 ----
s%@PWD@%$PWD%g
s%@INSTALLRELATIVE@%$INSTALLRELATIVE%g
s%@USERPATH@%$USERPATH%g
+ s%@INSTALLSUBDIR@%$INSTALLSUBDIR%g
CEOF
EOF
Index: top_ivtools/configure.in
diff -c top_ivtools/configure.in:1.1 top_ivtools/configure.in:1.2
*** top_ivtools/configure.in:1.1 Sat Jan 22 02:29:53 2000
--- ./configure.in Sat Jan 22 02:29:53 2000
***************
*** 284,289 ****
--- 284,291 ----
AC_ARG_ENABLE(use-rpath,[ --enable-use-rpath[=ARG] enable use of -rpath when linking], USERPATH=YES, USERPATH=NO)
+ AC_ARG_ENABLE(install-subdir,[ --enable-install-subdir[=ARG] enable installation in an ivtools sub-directory], INSTALLSUBDIR=YES, INSTALLSUBDIR=NO)
+
AC_SUBST(prefix)
#AC_SUBST(OPENGL)
#AC_SUBST(XGL)
***************
*** 314,319 ****
--- 316,322 ----
AC_SUBST(PWD)
AC_SUBST(INSTALLRELATIVE)
AC_SUBST(USERPATH)
+ AC_SUBST(INSTALLSUBDIR)
#output to config-$host_fragd
PWD=`pwd`; export PWD
Index: scripts_ivtools/mkdirhier.sh
diff -c scripts_ivtools/mkdirhier.sh:1.1 scripts_ivtools/mkdirhier.sh:1.2
*** scripts_ivtools/mkdirhier.sh:1.1 Sat Jan 22 02:30:26 2000
--- src/scripts/mkdirhier.sh Sat Jan 22 02:30:26 2000
***************
*** 37,43 ****
for filename
do
! path=$prefix$filename
prefix=$path/
shift
--- 37,45 ----
for filename
do
! if [ "$filename" != "" ]; then
! path=$prefix$filename
! fi
prefix=$path/
shift
***************
*** 50,63 ****
paths=$paths$newline$path
fi
done
! for paths
do
! if [ ! -f $paths ]; then
! mkdir $paths
! chmod g+w $paths
! fi
! done
break
}
--- 52,66 ----
paths=$paths$newline$path
fi
done
+
! for x in $paths
do
! if [ ! -d $x ]; then
! mkdir $x || status=$?
! chmod g+w $x
! fi
! done
break
}
Index: config_ivtools/config.defs.in
diff -c config_ivtools/config.defs.in:1.1 config_ivtools/config.defs.in:1.2
*** config_ivtools/config.defs.in:1.1 Sat Jan 22 02:30:32 2000
--- config/config.defs.in Sat Jan 22 02:30:32 2000
***************
*** 1,6 ****
--- 1,7 ----
/* This file generated from config.defs.in, */
/* (unless this file *is* config.defs.in :) */
+ #if !@INSTALLSUBDIR@
#define Prefix @prefix@
#define BinDir Prefix/bin
#define LibDir Prefix/lib
***************
*** 8,13 ****
--- 9,23 ----
#define IncDir Prefix/include
#define ConfigDir LibAllDir/config
#define ManDir Prefix/man
+ #else
+ #define Prefix @prefix@
+ #define BinDir Prefix/bin/ivtools
+ #define LibDir Prefix/lib/ivtools
+ #define LibAllDir Prefix/lib/ivtools
+ #define IncDir Prefix/include
+ #define ConfigDir LibAllDir/config
+ #define ManDir Prefix/man
+ #endif
#define XConfigDir @x_libraries@/X11/config
#define XIncDir @x_includes@
Index: config_ivtools/site.def.ALPHA
diff -c config_ivtools/site.def.ALPHA:1.1 config_ivtools/site.def.ALPHA:1.2
*** config_ivtools/site.def.ALPHA:1.1 Sat Jan 22 02:30:32 2000
--- config/site.def.ALPHA Sat Jan 22 02:30:32 2000
***************
*** 43,51 ****
#undef ExtraLibraries
#define ExtraLibraries /**/
- /* libg++ include directory -- usually does not change with new version of libg++ */
- #define GPlusPlusIncludeDir /usr/cal/lib/g++-include
-
/* machine-specific gcc include directory -- does not change with each new version of gcc */
/* TAKE CARE TO PUT THIS VALUE ALSO IN ExtraCCLdLibs !!! */
#define ToolIncludeDir /usr/cal/lib
--- 43,48 ----
***************
*** 70,83 ****
/* command to create shared libraries */
#define SharedLibraryCmd(ldobjs, extra_flags) gcc -shared -Xlinker -all -Xlinker /usr/cal/lib/libstdc++.a -Xlinker -none -lc -lm extra_flags -o $@ ldobjs
! /*
! * Enable/disable relative InterViews-style installation of binaries
*/
! #undef InstallRelative
! #define InstallRelative YES
! /* use -rpath instead of -L to get slack developers shared libraries */
! #define UseRpath NO
/* use symbolic links for relative install of libraries */
#if !UseRpath
--- 67,86 ----
/* command to create shared libraries */
#define SharedLibraryCmd(ldobjs, extra_flags) gcc -shared -Xlinker -all -Xlinker /usr/cal/lib/libstdc++.a -Xlinker -none -lc -lm extra_flags -o $@ ldobjs
! /*
! * Irix strip is broken
*/
! #undef InstPgmFlags
! #define InstPgmFlags /**/
! #if 0
! /* override InterViews/iv-alpha.cf */
! #undef InstallCmd
! #define InstallCmd ${INSTALL_PATH}/install.sh
! #endif
!
! /* file output by configure script */
! #include "config-alpha4-gcc.defs"
/* use symbolic links for relative install of libraries */
#if !UseRpath
***************
*** 104,153 ****
$(RM) dest/Concat(lib,libname.a)
#endif
#endif
-
- /*
- * Irix strip is broken
- */
- #undef InstPgmFlags
- #define InstPgmFlags /**/
-
- #if 0
- /* override InterViews/iv-alpha.cf */
- #undef InstallCmd
- #define InstallCmd ${INSTALL_PATH}/install.sh
- #endif
-
- #if 0
-
- /* -------------- imake way of configuring ------------------ */
-
- /*
- * Where to put binaries, libraries, and data files when InstallRelative is NO
- */
- #define BinDir /usr/local/bin
- #define LibDir /usr/local/lib
- #define LibAllDir /usr/local/lib/ivtools
-
- /*
- * X11 directories -- remember to override XCONFIGDIR the
- * first time you run "make World".
- */
- #define XConfigDir /usr/lib/X11/config
- #define XIncDir /usr/include
- #define XLibDir /usr/lib
-
- /* clippoly directory: comment out if not available */
- /* #define ClipPolyDir ProjectDir/clippoly */
-
- /* ACE directory: comment out if not available */
- /* #define AceDir ProjectDir/ACE_wrappers */
-
- #else
-
- /* --------------- autconf way of configuring --------------- */
-
- /* file output by configure script */
- #include "config-alpha4-gcc.defs"
-
- #endif
-
--- 107,109 ----
Index: config_ivtools/site.def.HP800
diff -c config_ivtools/site.def.HP800:1.1 config_ivtools/site.def.HP800:1.2
*** config_ivtools/site.def.HP800:1.1 Sat Jan 22 02:30:32 2000
--- config/site.def.HP800 Sat Jan 22 02:30:32 2000
***************
*** 30,38 ****
#undef TIFFOptimizeCFlags
#define TIFFOptimizeCFlags -O3
- /* libg++ include directory -- usually does not change with new version of libg++ */
- #define GPlusPlusIncludeDir /usr/local/lib/g++-include
-
/* machine-specific gcc include directory -- does not change with each new version of gcc */
#define ToolIncludeDir /usr/local/hppa1.1-hp-hpux9/include
--- 30,35 ----
***************
*** 43,51 ****
/* command to create shared libraries */
#define SharedLibraryCmd(ldobjs) g++ -shared -fpic -o $@ ldobjs
- /* use -rpath instead of -L to get slack developers shared libraries */
- #define UseRpath NO
-
/* Different LdPath for HP */
#define LdPath(libname) -Wl,+s -L$(LIBSRC)/libname/$(ARCH) Concat(-l,libname)
--- 40,45 ----
***************
*** 66,114 ****
$(RM) dest/Concat(lib,libname.sl)
#endif
- /*
- * Enable/disable relative InterViews-style installation of binaries
- */
- #undef InstallRelative
- #define InstallRelative YES
-
#undef BuildProgram
#define BuildProgram(program,depobjs,ldobjs,deplibs,ldlibs) @@\
program: depobjs deplibs @@\
RemoveIfUnwritable($@) @@\
g++ $(CCLDFLAGS) -o $@ ldobjs ldlibs
- #if 0
-
- /* -------------- imake way of configuring ------------------ */
-
- /*
- /*
- * Where to put binaries, libraries, and data files when InstallRelative is NO
- */
- #define BinDir /usr/local/bin
- #define LibDir /usr/local/lib
- #define LibAllDir /usr/local/lib/ivtools
-
- /*
- * X11 directories -- remember to override XCONFIGDIR the
- * first time you run "make World".
- */
- #define XConfigDir /usr/local/lib/imake
- #define XIncDir /usr/include/X11R5
- #define XLibDir /usr/lib/X11R5
-
- /* clippoly directory: comment out if not available */
- /* #define ClipPolyDir ProjectDir/clippoly */
-
- /* ACE directory: comment out if not available */
- /* #define AceDir ProjectDir/ACE_wrappers */
-
- #else
-
- /* --------------- autconf way of configuring --------------- */
-
/* file output by configure script */
#include "config-hpux-gcc.defs"
-
- #endif
--- 60,70 ----
Index: config_ivtools/site.def.LINUX
diff -c config_ivtools/site.def.LINUX:1.1 config_ivtools/site.def.LINUX:1.2
*** config_ivtools/site.def.LINUX:1.1 Sat Jan 22 02:30:32 2000
--- config/site.def.LINUX Sat Jan 22 02:30:32 2000
***************
*** 27,35 ****
#undef DefaultCCOptions
#define DefaultCCOptions /**/
- /* libg++ include directory -- usually does not change with new version of libg++ */
- #define GPlusPlusIncludeDir /usr/local/include/g++
-
/* machine-specific gcc include directory -- does not change with each new version of gcc */
#define ToolIncludeDir /usr/local/include
--- 27,32 ----
***************
*** 40,48 ****
/* command to create shared libraries */
#define SharedLibraryCmd(ldobjs,extra_flags) gcc -shared extra_flags -o $@ ldobjs
- /* use -rpath instead of -L to get slack developers shared libraries */
- #define UseRpath YES
-
/*
* Install a shared library on Linux.
*/
--- 37,42 ----
***************
*** 60,108 ****
$(RM) dest/Concat(lib,libname.so)
#endif
- /*
- * Enable/disable relative InterViews-style installation of binaries
- */
- #undef InstallRelative
- #define InstallRelative NO
-
- #if 0
-
- /* -------------- imake way of configuring ------------------ */
-
- /*
- /*
- * Where to put binaries, libraries, and data files when InstallRelative is NO
- */
- #if 1
- #define BinDir /usr/local/bin
- #define LibDir /usr/local/lib
- #define LibAllDir /usr/local/lib/ivtools
- #else
- #define InstalledRoot $(DESTDIR)/usr/X11R6 // for Debian
- #endif
-
- /*
- * X11 directories -- remember to override XCONFIGDIR the
- * first time you run "make World".
- */
- #define XConfigDir /usr/X11R6/lib/X11/config
- #define XIncDir /usr/X11R6/include
- #define XLibDir /usr/X11R6/lib
-
- /* clippoly directory: comment out if not available */
- /* #define ClipPolyDir ProjectDir/clippoly */
-
- /* ACE directory: comment out if not available */
- /* #define AceDir ProjectDir/ACE_wrappers */
-
- #else
-
- /* --------------- autconf way of configuring --------------- */
-
/* file output by configure script */
#include "config-linux-gcc.defs"
-
- #endif
--- 54,60 ----
Index: config_ivtools/site.def.NETBSD
diff -c config_ivtools/site.def.NETBSD:1.1 config_ivtools/site.def.NETBSD:1.2
*** config_ivtools/site.def.NETBSD:1.1 Sat Jan 22 02:30:32 2000
--- config/site.def.NETBSD Sat Jan 22 02:30:32 2000
***************
*** 37,45 ****
/* command to create shared libraries */
#define SharedLibraryCmd(ldobjs,extra_flags) gcc -shared extra_flags -o $@ ldobjs
- /* use -rpath instead of -L to get slack developers shared libraries */
- #define UseRpath YES
-
/*
* Install a shared library on NetBSD.
*/
--- 37,42 ----
***************
*** 56,64 ****
$(RM) dest/Concat(lib,libname.so.rev) @@\
$(RM) dest/Concat(lib,libname.so)
#endif
-
-
- /* --------------- autconf way of configuring --------------- */
/* file output by configure script */
#include "config-netbsd-gcc.defs"
--- 53,58 ----
Index: config_ivtools/site.def.SGI
diff -c config_ivtools/site.def.SGI:1.1 config_ivtools/site.def.SGI:1.2
*** config_ivtools/site.def.SGI:1.1 Sat Jan 22 02:30:32 2000
--- config/site.def.SGI Sat Jan 22 02:30:32 2000
***************
*** 27,35 ****
#undef ExtraLibraries
#define ExtraLibraries /**/
- /* libg++ include directory -- usually does not change with new version of libg++ */
- #define GPlusPlusIncludeDir /usr/local/lib/g++-include
-
/* machine-specific gcc include directory -- does not change with each new version of gcc */
#define ToolIncludeDir /usr/local/mips-sgi-irix5.2/include
--- 27,32 ----
***************
*** 42,55 ****
/* command to create shared libraries */
#define SharedLibraryCmd(ldobjs, extra_flags) gcc -shared extra_flags -o $@ ldobjs
! /*
! * Enable/disable relative InterViews-style installation of binaries
*/
! #undef InstallRelative
! #define InstallRelative YES
! /* use -rpath instead of -L to get slack developers shared libraries */
! #define UseRpath NO
/* use symbolic links for relative install of libraries */
#if !UseRpath
--- 39,52 ----
/* command to create shared libraries */
#define SharedLibraryCmd(ldobjs, extra_flags) gcc -shared extra_flags -o $@ ldobjs
! /*
! * Irix strip is broken
*/
! #undef InstPgmFlags
! #define InstPgmFlags /**/
! /* file output by configure script */
! #include "config-irix5-gcc.defs"
/* use symbolic links for relative install of libraries */
#if !UseRpath
***************
*** 75,118 ****
uninstall:: @@\
$(RM) dest/Concat(lib,libname.a)
#endif
- #endif
-
- /*
- * Irix strip is broken
- */
- #undef InstPgmFlags
- #define InstPgmFlags /**/
-
- #if 0
-
- /* -------------- imake way of configuring ------------------ */
-
- /*
- * Where to put binaries, libraries, and data files when InstallRelative is NO
- */
- #define BinDir /usr/local/bin
- #define LibDir /usr/local/lib
- #define LibAllDir /usr/local/lib/ivtools
-
- /*
- * X11 directories -- remember to override XCONFIGDIR the
- * first time you run "make World".
- */
- #define XConfigDir /usr/lib/X11/config
- #define XIncDir /usr/include
- #define XLibDir /usr/lib
-
- /* clippoly directory: comment out if not available */
- /* #define ClipPolyDir ProjectDir/clippoly */
-
- /* ACE directory: comment out if not available */
- /* #define AceDir ProjectDir/ACE_wrappers */
-
- #else
-
- /* --------------- autconf way of configuring --------------- */
-
- /* file output by configure script */
- #include "config-irix5-gcc.defs"
-
#endif
--- 72,75 ----
Index: config_ivtools/site.def.SUN4
diff -c config_ivtools/site.def.SUN4:1.1 config_ivtools/site.def.SUN4:1.2
*** config_ivtools/site.def.SUN4:1.1 Sat Jan 22 02:30:32 2000
--- config/site.def.SUN4 Sat Jan 22 02:30:32 2000
***************
*** 31,39 ****
#define BuildRPCClasses YES
#define SOMAXCONN 5
- /* libg++ include directory -- usually does not change with new version of libg++ */
- #define GPlusPlusIncludeDir /usr/local/lib/g++-include
-
/* link libraries for the above */
#undef ExtraCCLdLibs
#ifndef SVR4Architecture
--- 31,36 ----
***************
*** 98,143 ****
#undef InstallRelative
#define InstallRelative YES
- #if 0
-
- /* -------------- imake way of configuring ------------------ */
-
- /*
- * Where to put binaries, libraries, and data files when InstallRelative is NO
- */
- #define BinDir /usr/local/bin
- #define LibDir /usr/local/lib
- #define LibAllDir /usr/local/lib/ivtools
-
- /*
- * X11 directories -- remember to override XCONFIGDIR the
- * first time you run "make World".
- */
- #ifndef SVR4Architecture
- #define XConfigDir /usr/local/lib/X11/config
- #define XIncDir /usr/local/include
- #define XLibDir /usr/local/lib
- #else
- #define XConfigDir /usr/X/lib/X11/config
- #define XIncDir /usr/X/include
- #define XLibDir /usr/X/lib
- #endif
-
- /* clippoly directory: comment out if not available */
- #define ClipPolyDir ProjectDir/clippoly
-
- /* ACE directory: comment out if not available */
- #define AceDir ProjectDir/ACE_wrappers
-
- #else
-
- /* --------------- autconf way of configuring --------------- */
-
/* file output by configure script */
#ifdef SVR4Architecture
#include "config-solaris-gcc.defs"
#else
#include "config-sunos4-gcc.defs"
#endif
-
- #endif
\ No newline at end of file
--- 95,103 ----
|
