patch (fwd)
Elrond
Elrond at Wunder-Nett.org
Tue Mar 14 17:11:01 GMT 2000
On Tue, Mar 14, 2000 at 06:02:24AM +1100, Luke Kenneth Casson Leighton wrote:
> hi, pleases could people review and try out this patch and let me know if
> it breaks your system or not. the last patch of this type (for irix) i
> applied it broke aix, redhat linux and a few others.
>
> thank you, and thanks to michael breuer for the patch.
I haven't tested them, but some comments:
> diff -c -r samba-tng-alpha.0.14/source/Makefile.in samba-tng-alpha.0.14.IRIX.PATCH/source/Makefile.in
> *** samba-tng-alpha.0.14/source/Makefile.in Fri Mar 10 15:02:00 2000
> --- samba-tng-alpha.0.14.IRIX.PATCH/source/Makefile.in Mon Mar 13 09:07:24 2000
> ***************
> *** 441,447 ****
> nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o
>
> NMBD_OBJ = $(NMBD_OBJ1)
> ! NMBD_LIBS = $(SMBLIB) $(NMBLIB) $(SAMBALIB) $(UBIQXLIB) $(RPC_PARSE_OBJ2)
>
> SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
> web/swat.o libsmb/passchange.o $(LOCKING_OBJ) \
> --- 441,447 ----
> nmbd/nmbd_workgroupdb.o nmbd/nmbd_synclists.o
>
> NMBD_OBJ = $(NMBD_OBJ1)
> ! NMBD_LIBS = $(RPC_PARSE_OBJ2) $(SMBLIB) $(NMBLIB) $(SAMBALIB) $(UBIQXLIB)
>
> SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
> web/swat.o libsmb/passchange.o $(LOCKING_OBJ) \
That should be okay, but from a clean point,
$(RPC_PARSE_OBJ2) should realy be in NMBD_OBJ.
> ***************
> *** 605,611 ****
> smbwrapper/realcalls.o smbwrapper/shared.o
>
> CLIENT_OBJ = client/client.o client/clitar.o
> ! CLIENT_LIBS = $(SMBLIB) $(NMBLIB) $(SAMBALIB) $(RPC_PARSE_OBJ2)
>
> MOUNT_OBJ = client/smbmount.o client/clientutil.o \
> $(RPC_PARSE_OBJ2)
> --- 605,611 ----
> smbwrapper/realcalls.o smbwrapper/shared.o
This part is broken, patch wont accept it, but it looks
similiar. And the right action is also the same: move
$(RPC_PARSE_OBJ2) to CLIENT_OBJ.
> diff -c -r samba-tng-alpha.0.14/source/configure.in samba-tng-alpha.0.14.IRIX.PATCH/source/configure.in
> *** samba-tng-alpha.0.14/source/configure.in Fri Mar 10 15:02:14 2000
> --- samba-tng-alpha.0.14.IRIX.PATCH/source/configure.in Mon Mar 13 09:05:51 2000
> ***************
> *** 79,84 ****
> --- 79,94 ----
> *aix4*)
> CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
> ;;
> + #
> + # Irix needs standards.h to detect netinet
> + #
> + *irix*)
> + AC_CHECK_HEADERS(standards.h,
> + cat >> confdefs.h <<EOF
> + #include <standards.h>
> + EOF
> + )
> + ;;
> esac
>
> AC_INLINE
This shouldn't hurt for anyone except IRIX, so maybe Greg
can say something about it. And I have to say, I haven't
seen anything about that in configure.in in HEAD (and I
merged some parts from HEAD...)
But as someone suggested on samba-ntdom, you should add the
AC_PROG_CPP after AC_PROG_CC in configure.in
Elrond
More information about the samba-ntdom
mailing list