mirror of
https://github.com/bjc/prosody.git
synced 2025-04-03 05:07:42 +03:00
configure: Pass compiler flag to enable ICU only when building util.encodings
Passing it in CFLAGS applied to all modules, which was not needed.
This commit is contained in:
parent
a2ef355d20
commit
9eb8214030
3 changed files with 5 additions and 1 deletions
3
configure
vendored
3
configure
vendored
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue