Merge pull request #1 from leres/master

Unbreak building under FreeBSD
This commit is contained in:
Mark Webb-Johnson 2018-07-30 08:56:51 +08:00 committed by GitHub
commit 812f959cec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -230,12 +230,20 @@ LOADLIBES_nconf = $(shell \
|| pkg-config --libs menu panel ncurses 2>/dev/null \
|| echo "-lmenu -lpanel -lncurses" )
ifeq ("$(OS)","Windows_NT")
# Windows toolchains don't seem to count libintl
# as a system library
# Sometimes libintl is in a separate library (Windows, FreeBSD)
ifneq ($(wildcard /usr/local/lib/libintl.a),)
LOADLIBES_mconf += -L/usr/local/lib -lintl
LOADLIBES_nconf += -L/usr/local/lib -lintl
ifneq ($(wildcard /usr/local/include/libintl.h),)
CFLAGS += -I/usr/local/include
endif
else
ifneq ($(wildcard /usr/lib/libintl.a),)
LOADLIBES_mconf += -lintl
LOADLIBES_nconf += -lintl
endif
endif
qconf.o: .tmp_qtcheck