summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2007-01-04 17:27:04 -0800
committerJaka Kranjc2007-01-21 23:11:51 +0100
commit0ef52a62f8a5819b488e6daa2f54ed99f2f37a23 (patch)
tree9b958f9f9a7e9106ada517a4e622299ed99b5fe9
parent1cad0e6f80d76234242050f17b549dd4c69f5acd (diff)
Fix wpa_supplicant's compile with qt-x11 support when qt-x11 was just installed
-rw-r--r--net/wpa_supplicant/HISTORY5
-rwxr-xr-xnet/wpa_supplicant/PRE_BUILD8
2 files changed, 13 insertions, 0 deletions
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 0a8b1f07f1..7cf81e08d6 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,8 @@
+2007-01-04 Eric Sandall <eric@sandall.us>
+ * PRE_BUILD: For new installs, /etc/profile.d/qt.sh won't be sourced
+ until relogin, so we need to check for QTDIR and source qt.sh if
+ the user wants QT support.
+
2007-01-03 Juuso Alasuutari <iuso@sourcemage.org>
* INSTALL: Install example config file to /usr/share/wpa_supplicant/
(this is not the same as the default config file).
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 8149cb2076..a0c6b76903 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -7,4 +7,12 @@ sed -i "s|/local||g" Makefile &&
if [[ $WPA_RELEASE != old ]]
then
sed -i "s/wpa_cli dynamic_eap_methods/wpa_cli/" Makefile
+fi &&
+
+source "$GRIMOIRE/is_depends_enabled.function" &&
+
+if is_depends_enabled $SPELL qt-x11; then
+ if [[ -z $QTDIR ]]; then
+ source $TRACK_ROOT/etc/profile.d/qt.sh
+ fi
fi