Software / code / prosody
Changeset
800:5e12bca2a4f8
Merging with tip.
| author | Tobias Markmann <tm@ayena.de> |
|---|---|
| date | Sat, 14 Feb 2009 19:13:14 +0100 |
| parents | 799:b7ea802f3527 (current diff) 798:2a92b58144a9 (diff) |
| children | 801:d29febc977fc |
| files | |
| diffstat | 2 files changed, 24 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Feb 14 18:57:50 2009 +0100 +++ b/configure Sat Feb 14 19:13:14 2009 +0100 @@ -12,6 +12,8 @@ LUA_LIBDIR="/usr/lib" IDN_LIB=idn OPENSSL_LIB=crypto +CC=gcc +LD=gcc CFLAGS="-fPIC" LFLAGS="-shared" @@ -45,6 +47,12 @@ Default is $OPENSSL_LIB --cflags=FLAGS Flags to pass to the compiler Default is $CFLAGS +--lflags=FLAGS Flags to pass to the linker + Default is $LFLAGS +--c-compiler=CC The C compiler to use when building modules. + Default is $CC +--linker=CC The linker to use when building modules. + Default is $LD --require-config Will cause Prosody to refuse to run when it fails to find a configuration file EOF @@ -105,6 +113,12 @@ --cflags=*) CFLAGS="$value" ;; + --c-compiler=*) + CC="$value" + ;; + --linker=*) + LD="$value" + ;; *) echo "Error: Unknown flag: $1" exit 1 @@ -279,6 +293,8 @@ OPENSSL_LIB=$OPENSSL_LIB CFLAGS=$CFLAGS LFLAGS=$LFLAGS +CC=$CC +LD=$LD EOF
--- a/util-src/Makefile Sat Feb 14 18:57:50 2009 +0100 +++ b/util-src/Makefile Sat Feb 14 19:13:14 2009 +0100 @@ -6,7 +6,8 @@ LUA_LIB?=lua$(LUA_SUFFIX) IDN_LIB?=idn OPENSSL_LIB?=crypto - +CC?=gcc +LD?=gcc all: encodings.so hashes.so pposix.so @@ -21,18 +22,18 @@ rm -f ../util/*.so encodings.o: encodings.c - gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c + $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o encodings.o encodings.c encodings.so: encodings.o - export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o encodings.so encodings.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lidn + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o encodings.so encodings.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lidn hashes.o: hashes.c - gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c + $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o hashes.o hashes.c hashes.so: hashes.o - export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o hashes.so hashes.o -L/usr/local/lib -llua$(LUA_SUFFIX) -lcrypto + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o hashes.so hashes.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX) -lcrypto pposix.o: pposix.c - gcc $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c + $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o pposix.o pposix.c pposix.so: pposix.o - export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc $(LFLAGS) -o pposix.so pposix.o -L/usr/local/lib -llua$(LUA_SUFFIX) + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(LD) $(LFLAGS) -o pposix.so pposix.o -L$(LUA_LIBDIR) -llua$(LUA_SUFFIX)
