mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-12 06:41:13 +02:00
* configure.in: Get the paths for qt's md files right, so it can
build correctly when using a separate compilation directory. * configure: Regenerated.
This commit is contained in:
parent
dbc55d9636
commit
77c7a4332c
2 changed files with 50 additions and 38 deletions
44
configure
vendored
44
configure
vendored
|
@ -3418,35 +3418,41 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
echo "$ac_t""$host" 1>&6
|
echo "$ac_t""$host" 1>&6
|
||||||
|
|
||||||
|
|
||||||
|
# How can we refer to the qt source directory from within the qt build
|
||||||
|
# directory? For headers, we can rely on the fact that the qt src
|
||||||
|
# directory appears in the #include path.
|
||||||
|
|
||||||
|
qtsrcdir="`(cd $srcdir; pwd)`/qt"
|
||||||
|
|
||||||
case "$host" in
|
case "$host" in
|
||||||
i[3456]86-*-*)
|
i[3456]86-*-*)
|
||||||
qtmds_s=$srcdir/md/i386.s
|
qtmds_s=$qtsrcdir/md/i386.s
|
||||||
qtmd_h=$srcdir/md/i386.h
|
qtmd_h=md/i386.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
;;
|
;;
|
||||||
mips-sgi-irix5*)
|
mips-sgi-irix5*)
|
||||||
qtmds_s=$srcdir/md/mips-irix5.s
|
qtmds_s=$qtsrcdir/md/mips-irix5.s
|
||||||
qtmd_h=$srcdir/md/mips.h
|
qtmd_h=md/mips.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtdmdb_s=$srcdir/md/mips_b.s
|
qtdmdb_s=$qtsrcdir/md/mips_b.s
|
||||||
;;
|
;;
|
||||||
mips-*-*)
|
mips-*-*)
|
||||||
qtmds_s=$srcdir/md/mips.s
|
qtmds_s=$qtsrcdir/md/mips.s
|
||||||
qtmd_h=$srcdir/md/mips.h
|
qtmd_h=md/mips.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtdmdb_s=$srcdir/md/mips_b.s
|
qtdmdb_s=$qtsrcdir/md/mips_b.s
|
||||||
;;
|
;;
|
||||||
sparc-sun-solaris2.*)
|
sparc-sun-solaris2.*)
|
||||||
qtmd_h=$srcdir/md/sparc.h
|
qtmd_h=md/sparc.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtmds_s=$srcdir/md/sparc.s
|
qtmds_s=$qtsrcdir/md/sparc.s
|
||||||
qtdmdb_s=$srcdir/md/sparc_b.s
|
qtdmdb_s=$qtsrcdir/md/sparc_b.s
|
||||||
;;
|
;;
|
||||||
sparc-*-*)
|
sparc-*-*)
|
||||||
qtmd_h=$srcdir/md/sparc.h
|
qtmd_h=md/sparc.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtmds_s=$srcdir/md/_sparc.s
|
qtmds_s=$qtsrcdir/md/_sparc.s
|
||||||
qtdmdb_s=$srcdir/md/_sparc_b.s
|
qtdmdb_s=$qtsrcdir/md/_sparc_b.s
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown configuration; threads package disabled"
|
echo "Unknown configuration; threads package disabled"
|
||||||
|
|
44
configure.in
44
configure.in
|
@ -262,36 +262,42 @@ fi
|
||||||
# Determine the host we are working on
|
# Determine the host we are working on
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
|
# How can we refer to the qt source directory from within the qt build
|
||||||
|
# directory? For headers, we can rely on the fact that the qt src
|
||||||
|
# directory appears in the #include path.
|
||||||
|
|
||||||
|
qtsrcdir="`(cd $srcdir; pwd)`/qt"
|
||||||
|
|
||||||
changequote(,)dnl We use [ and ] in a regexp in the case
|
changequote(,)dnl We use [ and ] in a regexp in the case
|
||||||
case "$host" in
|
case "$host" in
|
||||||
i[3456]86-*-*)
|
i[3456]86-*-*)
|
||||||
qtmds_s=$srcdir/md/i386.s
|
qtmds_s=$qtsrcdir/md/i386.s
|
||||||
qtmd_h=$srcdir/md/i386.h
|
qtmd_h=md/i386.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
;;
|
;;
|
||||||
mips-sgi-irix5*)
|
mips-sgi-irix5*)
|
||||||
qtmds_s=$srcdir/md/mips-irix5.s
|
qtmds_s=$qtsrcdir/md/mips-irix5.s
|
||||||
qtmd_h=$srcdir/md/mips.h
|
qtmd_h=md/mips.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtdmdb_s=$srcdir/md/mips_b.s
|
qtdmdb_s=$qtsrcdir/md/mips_b.s
|
||||||
;;
|
;;
|
||||||
mips-*-*)
|
mips-*-*)
|
||||||
qtmds_s=$srcdir/md/mips.s
|
qtmds_s=$qtsrcdir/md/mips.s
|
||||||
qtmd_h=$srcdir/md/mips.h
|
qtmd_h=md/mips.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtdmdb_s=$srcdir/md/mips_b.s
|
qtdmdb_s=$qtsrcdir/md/mips_b.s
|
||||||
;;
|
;;
|
||||||
sparc-sun-solaris2.*)
|
sparc-sun-solaris2.*)
|
||||||
qtmd_h=$srcdir/md/sparc.h
|
qtmd_h=md/sparc.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtmds_s=$srcdir/md/sparc.s
|
qtmds_s=$qtsrcdir/md/sparc.s
|
||||||
qtdmdb_s=$srcdir/md/sparc_b.s
|
qtdmdb_s=$qtsrcdir/md/sparc_b.s
|
||||||
;;
|
;;
|
||||||
sparc-*-*)
|
sparc-*-*)
|
||||||
qtmd_h=$srcdir/md/sparc.h
|
qtmd_h=md/sparc.h
|
||||||
qtmdc_c=$srcdir/md/null.c
|
qtmdc_c=$qtsrcdir/md/null.c
|
||||||
qtmds_s=$srcdir/md/_sparc.s
|
qtmds_s=$qtsrcdir/md/_sparc.s
|
||||||
qtdmdb_s=$srcdir/md/_sparc_b.s
|
qtdmdb_s=$qtsrcdir/md/_sparc_b.s
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown configuration; threads package disabled"
|
echo "Unknown configuration; threads package disabled"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue