svn commit: samba r16478 - branches/SAMBA_3_0/source trunk/source
jerry at samba.org
jerry at samba.org
Thu Jun 22 22:00:43 GMT 2006
Author: jerry
Date: 2006-06-22 22:00:43 +0000 (Thu, 22 Jun 2006)
New Revision: 16478
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16478
Log:
small cleanup to make pam_winbind.so build and iniparser
include directory like other parts of the build files.
Modified:
branches/SAMBA_3_0/source/Makefile.in
branches/SAMBA_3_0/source/configure.in
trunk/source/Makefile.in
trunk/source/configure.in
Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in 2006-06-22 21:55:23 UTC (rev 16477)
+++ branches/SAMBA_3_0/source/Makefile.in 2006-06-22 22:00:43 UTC (rev 16478)
@@ -517,9 +517,6 @@
PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
lib/replace1.o $(SNPRINTF_OBJ) @BUILD_INIPARSER@
-PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@)
-
-
SMBW_OBJ1 = smbwrapper/smbw.o \
smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \
smbwrapper/realcalls.o smbwrapper/shared.o \
@@ -1217,7 +1214,7 @@
$(LDAP_LIBS) $(KRB5LIBS) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@) bin/.dummy
@echo "Linking shared library $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
@SONAMEFLAG@`basename $@` -lpam @INIPARSERLIBS@
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in 2006-06-22 21:55:23 UTC (rev 16477)
+++ branches/SAMBA_3_0/source/configure.in 2006-06-22 22:00:43 UTC (rev 16478)
@@ -5397,7 +5397,7 @@
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 @@
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=""
Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in 2006-06-22 21:55:23 UTC (rev 16477)
+++ trunk/source/Makefile.in 2006-06-22 22:00:43 UTC (rev 16478)
@@ -532,9 +532,6 @@
PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
lib/replace1.o $(SNPRINTF_OBJ) @BUILD_INIPARSER@
-PAM_WINBIND_PICOBJ = $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@)
-
-
SMBW_OBJ1 = smbwrapper/smbw.o \
smbwrapper/smbw_dir.o smbwrapper/smbw_stat.o \
smbwrapper/realcalls.o smbwrapper/shared.o \
@@ -1262,7 +1259,7 @@
$(LDAP_LIBS) $(KRB5LIBS) \
@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
-bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+bin/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_OBJ:.o=. at PICSUFFIX@) bin/.dummy
@echo "Linking shared library $@"
@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \
@SONAMEFLAG@`basename $@` -lpam @INIPARSERLIBS@
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in 2006-06-22 21:55:23 UTC (rev 16477)
+++ trunk/source/configure.in 2006-06-22 22:00:43 UTC (rev 16478)
@@ -5395,7 +5395,7 @@
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=""
@@ -5430,7 +5430,7 @@
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=""
More information about the samba-cvs
mailing list