Makefile: use ${CC} selected by configure

diff --git a/citadel/Makefile b/citadel/Makefile
index 026643ee500bac3bc46535bbf98d32ac110a304c..2a3193224a6cc47d158ee2f29e577aa6ad05c361 100644 (file)
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -26,44 +26,44 @@ $(BACKEND_SOURCES): server/*.h server/modules/*/*.h server/backends/*/*.h
 
 %.o: %.c
        @echo $<
-       @cc ${CFLAGS} -c $< -o $@
+       @${CC} ${CFLAGS} -c $< -o $@
 
 citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS)
-       cc ${CFLAGS} \
+       ${CC} ${CFLAGS} \
                $(SERVER_OBJECTS) $(BACKEND_OBJECTS) \
                ${LDFLAGS} \
                -lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \
                -o citserver
 
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel -o setup
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel -o setup
 
 ctdlmigrate: utils/ctdlmigrate.c server/citadel_dirs.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/ctdlmigrate.c -lcitadel -lreadline -o ctdlmigrate
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlmigrate.c -lcitadel -lreadline -o ctdlmigrate
 
 sendcommand: utils/sendcommand.c server/citadel_dirs.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/sendcommand.c -lcitadel -o sendcommand
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/sendcommand.c -lcitadel -o sendcommand
 
 loadtest: utils/loadtest.c server/citadel_dirs.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -o loadtest
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -o loadtest
 
 citmail: utils/citmail.c server/citadel_dirs.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/citmail.c -lcitadel -o citmail
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/citmail.c -lcitadel -o citmail
 
 chkpw: utils/chkpw.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/chkpw.c -o chkpw
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/chkpw.c -o chkpw
 
 chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h
-       cc ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd
 
 dbnothing: utils/dbnothing.c utils/*.h server/*.h ${BACKEND_OBJECTS}
-       cc ${CFLAGS} ${LDFLAGS} utils/dbnothing.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o dbnothing
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/dbnothing.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o dbnothing
 
 ctdldump: utils/ctdldump.c utils/*.h server/*.h ${BACKEND_OBJECTS}
-       cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdldump
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdldump.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdldump
 
 ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h ${BACKEND_OBJECTS}
-       cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdlload
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdlload
 
 config.mk: configure
        ./configure

diff --git a/citadel/configure b/citadel/configure
index 08b56c4fe1d25212e79694b6fa8dea7cfc2b2ec8..d53afb939e54a6c1d38ade36b520e44beeb4d402 100755 (executable)
--- a/citadel/configure
+++ b/citadel/configure
@@ -130,6 +130,7 @@ CFLAGS=${CFLAGS}' -DCTDLDIR=\"'${CTDLDIR}'\"'
 (
        echo '# config.mk is generated by configure'
        echo "CTDLDIR := ${CTDLDIR}"
+       echo "CC := ${CC}"
        echo "CFLAGS := ${CFLAGS} ${CPPFLAGS}"
        echo "LDFLAGS := ${LDFLAGS}"
        echo "BACKEND_LDFLAGS := ${BACKEND_LDFLAGS}"