Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / configure

diff --git a/configure b/configure
index 4993526d91adf6bcfb8931623dc18b1de079467c..8eb7b36747b53d67e7352634259b3bef67f13909 100755 (executable)
--- a/configure
+++ b/configure
@@ -13,7 +13,8 @@ LUA_LIBDIR="/usr/lib"
 IDN_LIB=idn
 OPENSSL_LIB=crypto
 
-CFLAGS="-shared -fPIC"
+CFLAGS="-fPIC"
+LFLAGS="-shared"
 
 # Help
 
@@ -122,8 +123,11 @@ then
        fi
        if [ "$OSTYPE" = "macosx" ]
        then LUA_INCDIR=/usr/local/include;
+       LUA_INCDIR_SET=yes      
        LUA_LIBDIR=/usr/local/lib
-       CFLAGS="-bundle -Wl,-undefined,dynamic_lookup"
+       LUA_LIBDIR_SET=yes
+       CFLAGS=""
+       LFLAGS="-bundle -undefined dynamic_lookup"
        fi      
 fi
 
@@ -274,6 +278,7 @@ REQUIRE_CONFIG=$REQUIRE_CONFIG
 IDN_LIB=$IDN_LIB
 OPENSSL_LIB=$OPENSSL_LIB
 CFLAGS=$CFLAGS
+LFLAGS=$LFLAGS
 
 EOF