diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 31 |
1 files changed, 25 insertions, 6 deletions
@@ -7,11 +7,12 @@ prefix=$default_prefix default_CC='c99' # FILE_OFFSET_BITS=64 is required for large file support on 32-bit platforms. default_CFLAGS='-O1 -g -D_FILE_OFFSET_BITS=64 -Wall -MD' -default_LDFLAGS="-lcjson -lssl -lm -lcrypto" +default_LDFLAGS="-lcjson -lm" CC=${CC:-$default_CC} CFLAGS=${CFLAGS:-"$default_CFLAGS $default_NPCFLAGS"} LDFLAGS=${LDFLAGS:-$default_LDFLAGS} +USERGEN_LDFLAGS=${LDFLAGS} help() { @@ -47,16 +48,27 @@ while true; do esac done +if pkg-config libsodium +then + CFLAGS="$CFLAGS $(pkg-config --cflags libsodium)" + LDFLAGS="$LDFLAGS $(pkg-config --libs libsodium)" +else + echo "Error: libsodium not found." >&2 + exit 1 +fi + if pkg-config dynstr then in_tree_dynstr=0 CFLAGS="$CFLAGS $(pkg-config --cflags dynstr)" LDFLAGS="$LDFLAGS $(pkg-config --libs dynstr)" + USERGEN_LDFLAGS="$USERGEN_LDFLAGS $(pkg-config --libs dynstr)" else echo "Info: dynstr not found. Using in-tree copy" >&2 in_tree_dynstr=1 CFLAGS="$CFLAGS -Ilibweb/dynstr/include" LDFLAGS="$LDFLAGS -Llibweb/dynstr -ldynstr" + USERGEN_LDFLAGS="$LDFLAGS -Llibweb/dynstr -ldynstr" fi if pkg-config libweb @@ -99,6 +111,7 @@ PREFIX = $prefix DST = $prefix/bin CFLAGS = $CFLAGS LDFLAGS = $LDFLAGS +USERGEN_LDFLAGS = $USERGEN_LDFLAGS EOF cat <<"EOF" >> $F @@ -106,7 +119,6 @@ PROJECT = slcl DEPS = $(OBJECTS:.o=.d) OBJECTS = \ auth.o \ - base64.o \ cftw.o \ crealpath.o \ hex.o \ @@ -116,9 +128,13 @@ OBJECTS = \ style.o \ zip.o -all: $(PROJECT) +USERGEN_OBJECTS = \ + hex.o \ + usergen.o \ + +all: $(PROJECT) usergen -install: all usergen +install: all mkdir -p $(DST) cp slcl usergen $(DST) chmod 0755 $(DST)/slcl @@ -129,6 +145,9 @@ FORCE: $(PROJECT): $(OBJECTS) $(CC) $(OBJECTS) $(LDFLAGS) -o $@ + +usergen: $(USERGEN_OBJECTS) + $(CC) $(USERGEN_OBJECTS) $(USERGEN_LDFLAGS) -o $@ EOF if [ $in_tree_dynstr -ne 0 ] @@ -156,7 +175,7 @@ then cat <<"EOF" >> $F FDZIPSTREAM = fdzipstream/libfdzipstream.a $(PROJECT): $(FDZIPSTREAM) -$(FDZIPSTREAM): FORCE +$(FDZIPSTREAM): FORCE $(DYNSTR) +cd fdzipstream && $(MAKE) CC=$(CC) EOF fi @@ -189,7 +208,7 @@ fi cat <<"EOF" >> $F distclean: clean - rm -f slcl + rm -f slcl usergen rm Makefile EOF |