r16478: small cleanup to make pam_winbind.so build and iniparser

include directory like other parts of the build files.
(This used to be commit 0fca41efde36d535a274b983e032c1def33f081e)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 136f597af3db3a3d1986721f19fa43df785810cb..dbff21a2c8552305979a535401cdf1ba8c842f28 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -517,9 +517,6 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
                  lib/replace1.o $(SNPRINTF_OBJ) @BUILD_INIPARSER@
 
-PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=.@PICSUFFIX@)
-
-
 SMBW_OBJ1 = smbwrapper/smbw.o \
                smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \
                smbwrapper/realcalls.o smbwrapper/shared.o \
@@ -1217,7 +1214,7 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
                $(LDAP_LIBS) $(KRB5LIBS) \
                @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
 
-bin/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+bin/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ:.o=.@PICSUFFIX@) bin/.dummy
        @echo "Linking shared library $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
                @SONAMEFLAG@`basename $@` -lpam @INIPARSERLIBS@

diff --git a/source3/configure.in b/source3/configure.in
index 9dce9e0e2c92a0da462e4868db764b258fbfad64..3749c80f04dc24ec40d00bf8e48a4b08b00f8758 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5397,7 +5397,7 @@ if test x"$INCLUDED_POPT" = x"yes"; then
     AC_MSG_RESULT(yes)
     BUILD_POPT='$(POPT_OBJS)'
        POPTLIBS='$(POPT_OBJS)'
-    FLAGS1="-I$srcdir/popt"
+    FLAGS1="-I\$(srcdir)/popt"
 else
     AC_MSG_RESULT(no)
        BUILD_POPT=""
@@ -5432,7 +5432,7 @@ if test x"$INCLUDED_INIPARSER" = x"yes"; then
     AC_MSG_RESULT(yes)
     BUILD_INIPARSER='$(INIPARSER_OBJ)'
        INIPARSERLIBS=""
-    FLAGS1="$FLAGS1 -I$srcdir/iniparser/src"
+    FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
 else
     AC_MSG_RESULT(no)
        BUILD_INIPARSER=""