1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
|
Author: Peter Bui <pbui@nd.edu>
Date: Thu Aug 11 19:38:59 2011 +0000
Description: Multiarch support for configure
configure: add possible support for Debian multiarch environment
Tested on wheezy/sid in virtual machine.
git-svn-id: svn://ccl.cse.nd.edu/trunk@1410 a4d8336d-3463-0410-8bba-c098c45d37a8
configure: add optional_include function
This function checks normal path, and then the multiarch path if it is
detected. Use this function to check for header files.
Tested on Debian Sid virtual machine.
git-svn-id: svn://ccl.cse.nd.edu/trunk@1415 a4d8336d-3463-0410-8bba-c098c45d37a8
Origin: upstream
--- a/configure
+++ b/configure
@@ -466,6 +466,8 @@
fi
fi
+check_multiarch
+
# accept ldflags from outside
ldflags="$ldflags $LDFLAGS"
--- a/configure.tools.sh
+++ b/configure.tools.sh
@@ -682,7 +682,7 @@
check_multiarch()
{
if [ -r /etc/debian_version ]; then
- HOST_MULTIARCH="$(uname -m)-linux-gnu"
+ HOST_MULTIARCH=$(dpkg-architecture -q DEB_HOST_MULTIARCH)
else
HOST_MULTIARCH=
fi
|