diff options
| author | Kim Alvefur <zash@zash.se> | 2020-07-12 23:28:04 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-07-12 23:28:04 +0200 |
| commit | 9eb8214030a32056841d8cc537430e7dccab1c33 (patch) | |
| tree | 59d3656e3f3cafc4a50f9f148e4a46deab1188d2 | |
| parent | a2ef355d2011ca458ffb941e25a032b78194fc56 (diff) | |
| download | prosody-9eb8214030a32056841d8cc537430e7dccab1c33.tar.gz prosody-9eb8214030a32056841d8cc537430e7dccab1c33.zip | |
configure: Pass compiler flag to enable ICU only when building util.encodings
Passing it in CFLAGS applied to all modules, which was not needed.
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | util-src/GNUmakefile | 1 | ||||
| -rw-r--r-- | util-src/makefile | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -524,7 +524,7 @@ fi if [ "$IDN_LIBRARY" = "icu" ] then IDNA_LIBS="$ICU_FLAGS" - CFLAGS="$CFLAGS -DUSE_STRINGPREP_ICU" + IDNA_FLAGS="-DUSE_STRINGPREP_ICU" fi if [ "$IDN_LIBRARY" = "idn" ] then @@ -569,6 +569,7 @@ LUA_INCDIR=$LUA_INCDIR LUA_LIBDIR=$LUA_LIBDIR LUA_BINDIR=$LUA_BINDIR IDN_LIB=$IDN_LIB +IDNA_FLAGS=$IDNA_FLAGS IDNA_LIBS=$IDNA_LIBS OPENSSL_LIBS=$OPENSSL_LIBS CFLAGS=$CFLAGS diff --git a/util-src/GNUmakefile b/util-src/GNUmakefile index 054c9201..e9e06355 100644 --- a/util-src/GNUmakefile +++ b/util-src/GNUmakefile @@ -24,6 +24,7 @@ install: $(ALL) clean: rm -f $(ALL) $(patsubst %.so,%.o,$(ALL)) +encodings.o: CFLAGS+=$(IDNA_FLAGS) encodings.so: LDLIBS+=$(IDNA_LIBS) hashes.so: LDLIBS+=$(OPENSSL_LIBS) diff --git a/util-src/makefile b/util-src/makefile index 700633b4..2db415df 100644 --- a/util-src/makefile +++ b/util-src/makefile @@ -23,6 +23,8 @@ install: $(ALL) clean: rm -f $(ALL) $(patsubst %.so,%.o,$(ALL)) +encodings.o: encodings.c + $(CC) $(CFLAGS) $(IDNA_FLAGS) -c -o $@ $< encodings.so: encodings.o $(LD) $(LDFLAGS) -o $@ $< $(LDLIBS) $(IDNA_LIBS) |