--- XSB.orig/build/configure.in 2007-08-23 07:21:23.000000000 +1200 +++ XSB/build/configure.in 2007-11-24 19:54:25.000000000 +1300 @@ -366,9 +366,9 @@ dnl prefix given by the user. The prefix variable will later get dnl the subdirectory added in. orig_prefix= -if test "$prefix" = "NONE" -o -z "$prefix" ; then +if test true ; then + install_prefix=$prefix/lib/xsb prefix=$topdir - orig_prefix=$prefix else dnl strip any trailing slashes in prefix prefix=`echo "${prefix}" | sed 's,\([[^/]]\)/*$,\1,'` @@ -429,7 +429,7 @@ fi config_prefix=${topdir}/config -install_config_prefix=${prefix}/config +install_config_prefix=${install_prefix}/config if test -n "$with_config_tag" ; then config_tag="-$with_config_tag" @@ -456,7 +456,7 @@ dnl If the user didn't specify --with-config-tag, check maybe -aout, -bits-64, dnl or -dbg are appropriate -if test -z "${with_config_tag}" ; then +if false ; then config_tag= dnl add -bits64 to the config tag, if --with-bits64 is set on command line if test "$bits64" = yes ; then @@ -547,10 +547,10 @@ canonical=$host configuration=${host_alias-${build_alias-$host}} if test "$configuration" = "NONE" -o -z "$configuration" ; then - echo ' -- You did not tell me what kind of host system you want to configure. -- I will attempt to guess the kind of system this is. -' 1>&6 +# echo ' +#- You did not tell me what kind of host system you want to configure. +#- I will attempt to guess the kind of system this is. +#' 1>&6 canonical=$host configuration=$host_alias else @@ -616,7 +616,7 @@ # site-specific directories # where the site is if test -z "$with_site_prefix" ; then - site_prefix=${orig_prefix}/site + site_prefix=${install_prefix}/site else site_prefix=$with_site_prefix fi @@ -629,17 +629,17 @@ site_config_libdir=${site_config_prefix}/lib # Installation directories: We only check if they exist -install_libdir=${prefix}/lib -install_syslibdir=${prefix}/syslib -install_cmplibdir=${prefix}/cmplib -install_emudir=${prefix}/emu -install_scriptdir=${prefix}/bin # where the xsb invocation script goes -install_builddir=${prefix}/build # where the config detection scripts go -install_prolog_includes=${prefix}/prolog_includes -install_pkgdir=${prefix}/packages -install_pkgxmcdir=${prefix}/packages/xmc -install_examples=${prefix}/examples -install_etcdir=${prefix}/etc +install_libdir=${install_prefix}/lib +install_syslibdir=${install_prefix}/syslib +install_cmplibdir=${install_prefix}/cmplib +install_emudir=${install_prefix}/emu +install_scriptdir=${install_prefix}/bin # where the xsb invocation script goes +install_builddir=${install_prefix}/build # where the config detection scripts go +install_prolog_includes=${install_prefix}/prolog_includes +install_pkgdir=${install_prefix}/packages +install_pkgxmcdir=${install_prefix}/packages/xmc +install_examples=${install_prefix}/examples +install_etcdir=${install_prefix}/etc arch_install_config_prefix=${install_config_prefix}/${full_config_name} arch_install_bindir=${arch_install_config_prefix}/bin @@ -658,7 +658,7 @@ rm -f buildxsb.lock exit 1 fi - +if false ; then # Test if directories exist echo "Checking installation directories..." @@ -778,7 +778,7 @@ test -f .missingdirs.tmp && exit 1 echo "Checking installation directories ... Done" - +fi AC_PROG_CC AC_PROG_CPP @@ -1114,7 +1114,7 @@ ODBCSRC="" ODBCOBJ="" -if test "${with_odbc+set}" = "set"; then +if test "${with_odbc}" = "yes"; then if test -n "$with_os" ; then echo -n "" # AC_DEFINE(XSB_ODBC) @@ -1152,11 +1152,11 @@ # with_odbc=no # else # AC_DEFINE(XSB_ODBC) - cat <