diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-22 22:00:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:18:56 -0500 |
| commit | 58edac3c27147435eadad7c4e0e7c0651ac36a7e (patch) | |
| tree | dd15fb4b8861378f7734cac9dee7a99843d4b2b1 | |
| parent | 491b9e637d60a3c86761c5dc348fbf0c2218f7ea (diff) | |
| download | samba-58edac3c27147435eadad7c4e0e7c0651ac36a7e.tar.gz samba-58edac3c27147435eadad7c4e0e7c0651ac36a7e.tar.bz2 samba-58edac3c27147435eadad7c4e0e7c0651ac36a7e.zip | |
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)
| -rw-r--r-- | source3/Makefile.in | 5 | ||||
| -rw-r--r-- | source3/configure.in | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 136f597af3..dbff21a2c8 100644 --- 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 9dce9e0e2c..3749c80f04 100644 --- 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="" |