faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support LDFLAGS and CPPFLAGS in configure

Browse source
This commit is contained in:
Miroslav Lichvar 2009-11-04 15:46:58 +01:00
parent c6e2eaf7a9
commit fe2cfe1fae
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile.in
View file

@ -31,7 +31,8 @@ INFODIR=@INFODIR@
CC = @CC@ CC = @CC@
CCWARNFLAGS = @CCWARNFLAGS@ CCWARNFLAGS = @CCWARNFLAGS@
OPTFLAGS = @CFLAGS@ @EXTRA_DEFS@ OPTFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ @SYSDEFS@ @EXTRA_DEFS@
DESTDIR= DESTDIR=
@ -54,13 +55,12 @@ EXTRA_SRCS = $(patsubst %.o,%.c,$(EXTRA_OBJS))
CLI_SRCS = $(patsubst %.o,%.c,$(CLI_OBJS)) CLI_SRCS = $(patsubst %.o,%.c,$(CLI_OBJS))
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@
EXTRA_LIBS=@EXTRA_LIBS@ EXTRA_LIBS=@EXTRA_LIBS@
EXTRA_CLI_LIBS=@EXTRA_CLI_LIBS@ EXTRA_CLI_LIBS=@EXTRA_CLI_LIBS@
DEFS=@SYSDEFS@
CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS) CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS)
# Until we have a main procedure we can link, just build object files # Until we have a main procedure we can link, just build object files
@ -75,7 +75,7 @@ chronyc : $(CLI_OBJS)
$(CC) $(OPTFLAGS) -o chronyc $(CLI_OBJS) $(LDFLAGS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS) $(CC) $(OPTFLAGS) -o chronyc $(CLI_OBJS) $(LDFLAGS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS)
client.o : client.c client.o : client.c
$(CC) $(CFLAGS) $(DEFS) @READLINE_COMPILE@ -c $< $(CC) $(CFLAGS) $(CPPFLAGS) @READLINE_COMPILE@ -c $<
.depend : .depend :
gcc -MM $(SRCS) $(EXTRA_SRCS) > .depend gcc -MM $(SRCS) $(EXTRA_SRCS) > .depend
@ -124,10 +124,10 @@ install: chronyd chronyc
chmod 444 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5 chmod 444 $(DESTDIR)$(MANDIR)/man5/chrony.conf.5
%.o : %.c %.o : %.c
$(CC) $(CFLAGS) $(DEFS) -c $< $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
%.s : %.c %.s : %.c
$(CC) $(CFLAGS) $(DEFS) -S $< $(CC) $(CFLAGS) $(CPPFLAGS) -S $<
main.o logging.o client.o : version.h main.o logging.o client.o : version.h

20
configure vendored
View file

@ -24,6 +24,8 @@ else
MYCFLAGS="${CFLAGS}" MYCFLAGS="${CFLAGS}"
fi fi
MYCPPFLAGS="${CPPFLAGS}"
# ====================================================================== # ======================================================================
# FUNCTIONS # FUNCTIONS
@ -40,15 +42,15 @@ int main(int argc, char **argv) {
} }
EOF EOF
${MYCC} ${MYCFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1 ${MYCC} ${MYCFLAGS} ${MYCPPFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
${MYCC} ${MYCFLAGS} -o docheck docheck.o >/dev/null 2>&1 ${MYCC} ${MYCFLAGS} ${MYCPPFLAGS} -o docheck docheck.o >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
result=0 result=0
else else
${MYCC} ${MYCFLAGS} -o docheck docheck.o -lm >/dev/null 2>&1 ${MYCC} ${MYCFLAGS} ${MYCPPFLAGS} -o docheck docheck.o -lm >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
result=1 result=1
@ -73,7 +75,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
${MYCC} ${MYCFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1 ${MYCC} ${MYCFLAGS} ${MYCPPFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
result=0 result=0
@ -94,7 +96,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
${MYCC} ${MYCFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1 ${MYCC} ${MYCFLAGS} ${MYCPPFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
result=0 result=0
@ -120,7 +122,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
${MYCC} ${MYCFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1 ${MYCC} ${MYCFLAGS} ${MYCPPFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
result=0 result=0
@ -144,7 +146,7 @@ int main(int argc, char **argv) {
} }
EOF EOF
${MYCC} ${MYCFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1 ${MYCC} ${MYCFLAGS} ${MYCPPFLAGS} -c -o docheck.o docheck.c >/dev/null 2>&1
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
result=0 result=0
@ -195,6 +197,8 @@ Fine tuning of the installation directories:
Some influential environment variables: Some influential environment variables:
CC C compiler command CC C compiler command
CFLAGS C compiler flags CFLAGS C compiler flags
CPPFLAGS C preprocessor flags, e.g. -I<include dir> if you have
headers in a nonstandard directory <include dir>
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir> nonstandard directory <lib dir>
@ -442,7 +446,9 @@ sed -e "s%@EXTRA_OBJECTS@%${EXTRA_OBJECTS}%;\
s%@CC@%${MYCC}%;\ s%@CC@%${MYCC}%;\
s%@CFLAGS@%${MYCFLAGS}%;\ s%@CFLAGS@%${MYCFLAGS}%;\
s%@CCWARNFLAGS@%${CCWARNFLAGS}%;\ s%@CCWARNFLAGS@%${CCWARNFLAGS}%;\
s%@CPPFLAGS@%${CPPFLAGS}%;\
s%@LIBS@%${LIBS}%;\ s%@LIBS@%${LIBS}%;\
s%@LDFLAGS@%${LDFLAGS}%;\
s%@EXTRA_LIBS@%${EXTRA_LIBS}%;\ s%@EXTRA_LIBS@%${EXTRA_LIBS}%;\
s%@SYSDEFS@%${SYSDEFS}%;\ s%@SYSDEFS@%${SYSDEFS}%;\
s%@EXTRA_DEFS@%${EXTRA_DEFS}%;\ s%@EXTRA_DEFS@%${EXTRA_DEFS}%;\