aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-10 17:00:10 +0200
committerKim Alvefur <zash@zash.se>2016-08-10 17:00:10 +0200
commite06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d (patch)
tree52c29734b165fdace6d9af676cc69f55e818831d
parent73579026ea1c955372484e57006bef2811f792c7 (diff)
parent64e565546890b709a23ce3d3077e69d7822a6703 (diff)
downloadprosody-e06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d.tar.gz
prosody-e06f1294be5799b2bb70d8c3b5f2ad5816a2bc0d.zip
Merge 0.10->trunk
-rwxr-xr-xconfigure2
1 files changed, 0 insertions, 2 deletions
diff --git a/configure b/configure
index 77aa1329..35946cf6 100755
--- a/configure
+++ b/configure
@@ -15,7 +15,6 @@ IDN_LIB=idn
ICU_FLAGS="-licui18n -licudata -licuuc"
OPENSSL_LIB=crypto
CC=gcc
-CXX=g++
LD=gcc
RUNWITH=lua
EXCERTS=yes
@@ -385,7 +384,6 @@ OPENSSL_LIBS=$OPENSSL_LIBS
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
CC=$CC
-CXX=$CXX
LD=$LD
RUNWITH=$RUNWITH
EXCERTS=$EXCERTS