# HG changeset patch # User Matthew Wild <mwild1@gmail.com> # Date 1228405699 0 # Node ID c9dbfcf21846edc81e42376389fb8a78f1afa023 # Parent 3521e0851c9ef27b892a83bd147788b5450699f6# Parent 26d000f259397b05859cf6b2a449c33952043071 Automated merge with http://waqas.ath.cx/ diff -r 3521e0851c9e -r c9dbfcf21846 .hgtags --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Thu Dec 04 15:48:19 2008 +0000 @@ -0,0 +1,1 @@ +c157c1412bda91b6e075e70875b4605e3e20b290 0.1.0 diff -r 3521e0851c9e -r c9dbfcf21846 configure --- a/configure Thu Dec 04 20:16:30 2008 +0500 +++ b/configure Thu Dec 04 15:48:19 2008 +0000 @@ -13,7 +13,8 @@ IDN_LIB=idn OPENSSL_LIB=crypto -CFLAGS="-shared -fPIC" +CFLAGS="-fPIC" +LFLAGS="-shared" # Help @@ -125,7 +126,8 @@ LUA_INCDIR_SET=yes LUA_LIBDIR=/usr/local/lib LUA_LIBDIR_SET=yes - CFLAGS="-bundle -Wl,-undefined,dynamic_lookup" + CFLAGS="" + LFLAGS="-bundle -undefined dynamic_lookup" fi fi @@ -276,6 +278,7 @@ IDN_LIB=$IDN_LIB OPENSSL_LIB=$OPENSSL_LIB CFLAGS=$CFLAGS +LFLAGS=$LFLAGS EOF diff -r 3521e0851c9e -r c9dbfcf21846 util-src/Makefile --- a/util-src/Makefile Thu Dec 04 20:16:30 2008 +0500 +++ b/util-src/Makefile Thu Dec 04 15:48:19 2008 +0000 @@ -12,16 +12,21 @@ all: encodings.so hashes.so install: encodings.so hashes.so - install -s *.so ../util/ + install *.so ../util/ clean: rm -f *.so rm -f ../util/*.so -encodings.so: encodings.c - gcc $(CFLAGS) encodings.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(IDN_LIB) -o encodings.so +encodings.o: encodings.c + gcc $(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) -lcrypto -lidn + -hashes.so: hashes.c - gcc $(CFLAGS) hashes.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so +hashes.o: hashes.c + gcc $(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 -lssl