autoconf: Use $(DEFS) when building idmapwb.so and pam_cifscreds.so
diff mbox

Message ID 1452255879-2180-1-git-send-email-sprabhu@redhat.com
State New
Headers show

Commit Message

Sachin Prabhu Jan. 8, 2016, 12:24 p.m. UTC
We should pass the macros defined in $(DEFS) when building idmapwb.so
and pam_cifscreds.so. The autoconf process sets the macro HAVE_CONFIG_H
using the $(DEFS) variable. This macro has to be defined to allow the
source files to include config.h

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jeff Layton Jan. 21, 2016, 3:13 a.m. UTC | #1
On Fri,  8 Jan 2016 17:54:39 +0530
Sachin Prabhu <sprabhu@redhat.com> wrote:

> We should pass the macros defined in $(DEFS) when building idmapwb.so
> and pam_cifscreds.so. The autoconf process sets the macro HAVE_CONFIG_H
> using the $(DEFS) variable. This macro has to be defined to allow the
> source files to include config.h
> 
> Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
> ---
>  Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 92da8b1..2e99e60 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -84,7 +84,7 @@ plugin_PROGRAMS = idmapwb.so
>  man_MANS += idmapwb.8
>  
>  idmapwb.so: idmapwb.c
> -	$(CC) $(CFLAGS) $(AM_CFLAGS) $(WBCLIENT_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ $(WBCLIENT_LIBS)
> +	$(CC) $(DEFS) $(CFLAGS) $(AM_CFLAGS) $(WBCLIENT_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ $(WBCLIENT_LIBS)
>  
>  idmapwb.8: idmapwb.8.in
>  	$(SED) 's,[@]pluginpath@,$(pluginpath),' $(srcdir)/$@.in > $@-t && mv $@-t $@
> @@ -95,7 +95,7 @@ if CONFIG_PAM
>  pam_PROGRAMS = pam_cifscreds.so
>  
>  pam_cifscreds.so: pam_cifscreds.c cifskey.c resolve_host.c util.c
> -	$(CC) $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ -lpam -lkeyutils
> +	$(CC) $(DEFS) $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ -lpam -lkeyutils
>  man_MANS += pam_cifscreds.8
>  endif
>  

Merged.

Thanks,

Patch
diff mbox

diff --git a/Makefile.am b/Makefile.am
index 92da8b1..2e99e60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@  plugin_PROGRAMS = idmapwb.so
 man_MANS += idmapwb.8
 
 idmapwb.so: idmapwb.c
-	$(CC) $(CFLAGS) $(AM_CFLAGS) $(WBCLIENT_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ $(WBCLIENT_LIBS)
+	$(CC) $(DEFS) $(CFLAGS) $(AM_CFLAGS) $(WBCLIENT_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ $(WBCLIENT_LIBS)
 
 idmapwb.8: idmapwb.8.in
 	$(SED) 's,[@]pluginpath@,$(pluginpath),' $(srcdir)/$@.in > $@-t && mv $@-t $@
@@ -95,7 +95,7 @@  if CONFIG_PAM
 pam_PROGRAMS = pam_cifscreds.so
 
 pam_cifscreds.so: pam_cifscreds.c cifskey.c resolve_host.c util.c
-	$(CC) $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ -lpam -lkeyutils
+	$(CC) $(DEFS) $(CFLAGS) $(AM_CFLAGS) $(LDFLAGS) -shared -fpic -o $@ $+ -lpam -lkeyutils
 man_MANS += pam_cifscreds.8
 endif