[patch] resend samba_2_2 exe patch
Green, Paul
Paul.Green at stratus.com
Sun Mar 2 20:17:11 GMT 2003
This is a resend of a patch I originally submitted on Feb 9th to the
samba_2_2 tree. It is probably too late to include it in the forthcoming
2.2.8 release, but if so, I would request that it be applied soon
afterwards. It is similar to changes I submitted to head and 3.0 some time
ago. I've been running this patch here for some time without problems.
It simply teachs Makefile.in and configure.in to observe any possible
executable extension.
After it is applied, the follow change must be made to the build farm:
--- build_test.fns.old Sun Mar 2 15:01:02 2003
+++ build_test.fns Sun Mar 2 15:01:27 2003
@@ -127,7 +127,7 @@
do_make proto everything torture
;;
samba_2_2)
- do_make everything bin/smbtorture
+ do_make everything
;;
rsync)
do_make all
(the bin/smbtorture is redundant & wrong when there are extensions).
Thanks
PG
--
Paul Green, Senior Technical Consultant,
Stratus Technologies, Maynard, MA USA
Voice: +1 978-461-7557; FAX: +1 978-461-3610
Speaking from Stratus not for Stratus
-------------- next part --------------
diff -urp old/samba_2_2/source/Makefile.in new/samba_2_2/source/Makefile.in
--- old/samba_2_2/source/Makefile.in Sun Feb 9 17:44:55 2003
+++ new/samba_2_2/source/Makefile.in Tue Feb 11 07:35:51 2003
@@ -17,6 +17,7 @@ CPPFLAGS=@CPPFLAGS@
LDFLAGS=@LDFLAGS@
AWK=@AWK@
DYNEXP=@DYNEXP@
+EXEEXT=@EXEEXT@
TERMLDFLAGS=@TERMLDFLAGS@
TERMLIBS=@TERMLIBS@
@@ -96,13 +97,15 @@ WINBIND_SPROGS = @WINBIND_STARGETS@
WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@
WINBIND_LPROGS = @WINBIND_LTARGETS@
-SPROGS = bin/smbd bin/nmbd bin/swat
-PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/tdbbackup bin/make_printerdef @RUNPROG@
-PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAPPROG@ @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT@
+SPROGS = bin/smbd$(EXEEXT) bin/nmbd$(EXEEXT) bin/swat$(EXEEXT)
+PROGS1 = bin/smbclient$(EXEEXT) bin/smbspool$(EXEEXT) bin/testparm$(EXEEXT) bin/testprns$(EXEEXT) bin/smbstatus$(EXEEXT) \
+ bin/smbcontrol$(EXEEXT) bin/tdbbackup$(EXEEXT) bin/make_printerdef$(EXEEXT) @RUNPROG@
+PROGS2 = bin/smbpasswd$(EXEEXT) bin/make_smbcodepage$(EXEEXT) bin/rpcclient$(EXEEXT) bin/make_unicodemap$(EXEEXT) \
+ bin/smbcacls$(EXEEXT) @WRAPPROG@ @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT@
MPROGS = @MPROGS@
LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
-PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup
-TORTURE_PROGS = bin/smbtorture bin/msgtest bin/masktest bin/locktest bin/locktest2
+PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup$(EXEEXT)
+TORTURE_PROGS = bin/smbtorture$(EXEEXT) bin/msgtest$(EXEEXT) bin/masktest$(EXEEXT) bin/locktest$(EXEEXT) bin/locktest2$(EXEEXT)
SHLIBS = @LIBSMBCLIENT@
SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/findsmb
@@ -438,27 +441,28 @@ libsmbclient : CHECK bin/libsmbclient.a
torture : CHECK $(TORTURE_PROGS)
-smbtorture : CHECK bin/smbtorture
+smbtorture : CHECK bin/smbtorture$(EXEEXT)
+bin/smbtorture : CHECK bin/smbtorture$(EXEEXT)
-masktest : CHECK bin/masktest
+masktest : CHECK bin/masktest$(EXEEXT)
-msgtest : CHECK bin/msgtest
+msgtest : CHECK bin/msgtest$(EXEEXT)
-locktest : CHECK bin/locktest
+locktest : CHECK bin/locktest$(EXEEXT)
-smbcacls : CHECK bin/smbcacls
+smbcacls : CHECK bin/smbcacls$(EXEEXT)
-locktest2 : CHECK bin/locktest2
+locktest2 : CHECK bin/locktest2$(EXEEXT)
-rpctorture : CHECK bin/rpctorture
+rpctorture : CHECK bin/rpctorture$(EXEEXT)
-bin/rpccheck: $(RPCCHECK_OBJ) bin/.dummy
+bin/rpccheck$(EXEEXT): $(RPCCHECK_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(RPCCHECK_OBJ) $(LDFLAGS) $(LIBS)
-debug2html : CHECK bin/debug2html
+debug2html : CHECK bin/debug2html$(EXEEXT)
-smbfilter : CHECK bin/smbfilter
+smbfilter : CHECK bin/smbfilter$(EXEEXT)
nsswitch : CHECK $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS)
@@ -512,128 +516,127 @@ bin/.dummy:
dir=bin $(MAKEDIR); fi
@: >> $@ || : > $@ # what a fancy emoticon!
-bin/smbd: $(SMBD_OBJ) bin/.dummy
+bin/smbd$(EXEEXT): $(SMBD_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS)
-bin/nmbd: $(NMBD_OBJ) bin/.dummy
+bin/nmbd$(EXEEXT): $(NMBD_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(LIBS)
-bin/swat: $(SWAT_OBJ) bin/.dummy
+bin/swat$(EXEEXT): $(SWAT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS)
-bin/rpcclient: $(RPCCLIENT_OBJ) bin/.dummy
+bin/rpcclient$(EXEEXT): $(RPCCLIENT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(LDAPLIBS)
-bin/smbclient: $(CLIENT_OBJ) bin/.dummy
+bin/smbclient$(EXEEXT): $(CLIENT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS)
-bin/smbspool: $(CUPS_OBJ) bin/.dummy
+bin/smbspool$(EXEEXT): $(CUPS_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbmount: $(MOUNT_OBJ) bin/.dummy
+bin/smbmount$(EXEEXT): $(MOUNT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MOUNT_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbmnt: $(MNT_OBJ) bin/.dummy
+bin/smbmnt$(EXEEXT): $(MNT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbumount: $(UMOUNT_OBJ) bin/.dummy
+bin/smbumount$(EXEEXT): $(UMOUNT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(LDFLAGS) $(LIBS)
-bin/testparm: $(TESTPARM_OBJ) bin/.dummy
+bin/testparm$(EXEEXT): $(TESTPARM_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(LIBS)
-bin/testprns: $(TESTPRNS_OBJ) bin/.dummy
+bin/testprns$(EXEEXT): $(TESTPRNS_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TESTPRNS_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbstatus: $(STATUS_OBJ) bin/.dummy
+bin/smbstatus$(EXEEXT): $(STATUS_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbcontrol: $(SMBCONTROL_OBJ) bin/.dummy
+bin/smbcontrol$(EXEEXT): $(SMBCONTROL_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBCONTROL_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbpasswd: $(SMBPASSWD_OBJ) bin/.dummy
+bin/smbpasswd$(EXEEXT): $(SMBPASSWD_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS)
-bin/pdbedit: $(PDBEDIT_OBJ) bin/.dummy
+bin/pdbedit$(EXEEXT): $(PDBEDIT_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS)
-bin/make_smbcodepage: $(MAKE_SMBCODEPAGE_OBJ) bin/.dummy
+bin/make_smbcodepage$(EXEEXT): $(MAKE_SMBCODEPAGE_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MAKE_SMBCODEPAGE_OBJ) $(LDFLAGS) $(LIBS)
-bin/make_unicodemap: $(MAKE_UNICODEMAP_OBJ) bin/.dummy
+bin/make_unicodemap$(EXEEXT): $(MAKE_UNICODEMAP_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MAKE_UNICODEMAP_OBJ) $(LDFLAGS) $(LIBS)
-bin/nmblookup: $(NMBLOOKUP_OBJ) bin/.dummy
+bin/nmblookup$(EXEEXT): $(NMBLOOKUP_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(LIBS)
-bin/make_printerdef: $(MAKE_PRINTERDEF_OBJ) bin/.dummy
+bin/make_printerdef$(EXEEXT): $(MAKE_PRINTERDEF_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MAKE_PRINTERDEF_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbtorture: $(SMBTORTURE_OBJ) bin/.dummy
+bin/smbtorture$(EXEEXT): $(SMBTORTURE_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(LIBS)
-bin/masktest: $(MASKTEST_OBJ) bin/.dummy
+bin/masktest$(EXEEXT): $(MASKTEST_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(LIBS)
-bin/msgtest: $(MSGTEST_OBJ) bin/.dummy
+bin/msgtest$(EXEEXT): $(MSGTEST_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbcacls: $(SMBCACLS_OBJ) bin/.dummy
+bin/smbcacls$(EXEEXT): $(SMBCACLS_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(LDAPLIBS)
-bin/locktest: $(LOCKTEST_OBJ) bin/.dummy
+bin/locktest$(EXEEXT): $(LOCKTEST_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(LIBS)
-bin/locktest2: $(LOCKTEST2_OBJ) bin/.dummy
+bin/locktest2$(EXEEXT): $(LOCKTEST2_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(LIBS)
-bin/nsstest: $(NSSTEST_OBJ) bin/.dummy
+bin/nsstest$(EXEEXT): $(NSSTEST_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(LIBS)
-bin/rpctorture: $(RPCTORTURE_OBJ) bin/.dummy
+bin/rpctorture$(EXEEXT): $(RPCTORTURE_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS)
-bin/debug2html: $(DEBUG2HTML_OBJ) bin/.dummy
+bin/debug2html$(EXEEXT): $(DEBUG2HTML_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(LIBS)
-bin/smbfilter: $(SMBFILTER_OBJ) bin/.dummy
+bin/smbfilter$(EXEEXT): $(SMBFILTER_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS)
-
-bin/smbw_sample: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy
+bin/smbw_sample$(EXEEXT): $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS)
-bin/smbsh: $(SMBSH_OBJ) bin/.dummy
+bin/smbsh$(EXEEXT): $(SMBSH_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS)
@@ -666,7 +669,7 @@ nsswitch/libnss_wins.so: $(NSS_OBJ)
@$(SHLD) @LDSHFLAGS@ -o $@ $(NSS_OBJ) -lc \
@SONAMEFLAG@`basename $@`
-bin/winbindd: $(WINBINDD_OBJ) bin/.dummy
+bin/winbindd$(EXEEXT): $(WINBINDD_OBJ) bin/.dummy
@echo Linking $@
@$(LINK) -o $@ $(WINBINDD_OBJ) $(DYNEXP) $(LIBS) $(LDAPLIBS)
@@ -685,17 +688,17 @@ nsswitch/pam_winbind.so: $(PAM_WINBIND_O
@$(SHLD) @LDSHFLAGS@ -o $@ $(PAM_WINBIND_OBJ) \
@SONAMEFLAG@`basename $@`
-bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \
+bin/wbinfo$(EXEEXT): $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \
$(UBIQX_OBJ) @BUILD_POPT@ bin/.dummy
@echo Linking $@
@$(LINK) -o $@ $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \
$(UBIQX_OBJ) $(LIBS) @BUILD_POPT@
-bin/tdbbackup: $(TDBBACKUP_OBJ) bin/.dummy
+bin/tdbbackup$(EXEEXT): $(TDBBACKUP_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TDBBACKUP_OBJ)
-bin/tdbdump: $(TDBDUMP_OBJ) bin/.dummy
+bin/tdbdump$(EXEEXT): $(TDBDUMP_OBJ) bin/.dummy
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TDBDUMP_OBJ)
diff -urp old/samba_2_2/source/configure.in new/samba_2_2/source/configure.in
--- old/samba_2_2/source/configure.in Sun Feb 9 18:01:26 2003
+++ new/samba_2_2/source/configure.in Sun Feb 9 19:40:09 2003
@@ -187,6 +187,8 @@ AC_PROG_AWK
dnl Check if we use GNU ld
LD=ld
AC_PROG_LD_GNU
+dnl look for executable suffix
+AC_EXEEXT
AC_PATH_PROG(passwd_program, passwd, /bin/passwd)
AC_SUBST(passwd_program)
@@ -736,7 +738,7 @@ fi
# Check if we have execl, if not we need to compile smbrun.
AC_CHECK_FUNCS(execl)
if test x"$ac_cv_func_execl" = x"no"; then
- RUNPROG="bin/smbrun"
+ RUNPROG="bin/smbrun\$(EXEEXT)"
else
RUNPROG=""
fi
@@ -1859,7 +1861,7 @@ AC_ARG_WITH(smbwrapper,
yes)
AC_MSG_RESULT(yes)
AC_DEFINE(WITH_SMBWRAPPER)
- WRAPPROG="bin/smbsh"
+ WRAPPROG="bin/smbsh\$(EXEEXT)"
WRAP="bin/smbwrapper.$SHLIBEXT"
if test x$ATTEMPT_WRAP32_BUILD = x; then
@@ -2187,7 +2189,7 @@ if test $with_smbpasswd_sam = yes; then
PDBEDIT=""
else
AC_MSG_RESULT(no)
- PDBEDIT=bin/pdbedit
+ PDBEDIT="bin/pdbedit\$(EXEEXT)"
fi
########################################################################################
@@ -3021,8 +3023,8 @@ if test x"$HAVE_WINBIND" = x"yes"; then
# Check for FreeBSD problem with getgroups
- WINBIND_TARGETS="bin/wbinfo"
- WINBIND_STARGETS="bin/winbindd"
+ WINBIND_TARGETS="bin/wbinfo\$(EXEEXT)"
+ WINBIND_STARGETS="bin/winbindd\$(EXEEXT)"
case "$host_os" in
*irix*)
WINBIND_LTARGETS="nsswitch/libns_winbind.so"
More information about the samba-technical
mailing list