sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

get rid of IRIX o32 builds - some libraries (kerberos and ldap) are only

Browse Source 
n32 so smbwrapper fails to link.
(This used to be commit 392f207a35)
This commit is contained in:
Herb Lewis 2003-06-06 23:55:24 +00:00
parent 6ae4c3c966
commit 9960487103
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/Makefile.in
View File

@ -106,7 +106,6 @@ FLAGS3 =
FLAGS4 = FLAGS4 =
FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
FLAGS = $(ISA) $(FLAGS5) FLAGS = $(ISA) $(FLAGS5)
FLAGS32 = $(ISA32) $(FLAGS5)
PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\" PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\"
@ -661,7 +660,6 @@ everything: all libsmbclient debug2html smbfilter talloctort modules torture
SHOWFLAGS: SHOWFLAGS:
@echo "Using FLAGS = $(FLAGS)" @echo "Using FLAGS = $(FLAGS)"
@echo " FLAGS32 = $(FLAGS32)"
@echo " LIBS = $(LIBS)" @echo " LIBS = $(LIBS)"
@echo " LDSHFLAGS = $(LDSHFLAGS)" @echo " LDSHFLAGS = $(LDSHFLAGS)"
@echo " LDFLAGS = $(LDFLAGS)" @echo " LDFLAGS = $(LDFLAGS)"
@ -881,11 +879,6 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy
@$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \ @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \
@SONAMEFLAG@`basename $@` $(KRB5LIBS) @SONAMEFLAG@`basename $@` $(KRB5LIBS)
bin/smbwrapper.32.@SHLIBEXT@: $(PICOBJS32)
@echo Linking shared library $@
@$(SHLD) -32 $(LDSHFLAGS) -o $@ $(PICOBJS32) $(LIBS) \
@SONAMEFLAG@`basename $@` $(KRB5LIBS)
bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient shared library $@ @echo Linking libsmbclient shared library $@
@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \ @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \

13
source3/configure.in
View File

@ -1024,7 +1024,6 @@ if test "$enable_shared" = "yes"; then
*irix6*) AC_DEFINE(IRIX6,1,[Whether the host os is irix6]) *irix6*) AC_DEFINE(IRIX6,1,[Whether the host os is irix6])
;; ;;
esac esac
ATTEMPT_WRAP32_BUILD=yes
BLDSHARED="true" BLDSHARED="true"
LDSHFLAGS="-set_version sgi1.0 -shared" LDSHFLAGS="-set_version sgi1.0 -shared"
SONAMEFLAG="-soname " SONAMEFLAG="-soname "
@ -2035,27 +2034,19 @@ AC_ARG_WITH(smbwrapper,
WRAPPROG="bin/smbsh\$(EXEEXT)" WRAPPROG="bin/smbsh\$(EXEEXT)"
WRAP="bin/smbwrapper.$SHLIBEXT" WRAP="bin/smbwrapper.$SHLIBEXT"
if test x$ATTEMPT_WRAP32_BUILD = x; then
WRAP32=""
else
WRAP32=bin/smbwrapper.32.$SHLIBEXT
fi
# Conditions under which smbwrapper should not be built. # Conditions under which smbwrapper should not be built.
if test x$PICFLAG = x; then if test x$PICFLAG = x; then
echo No support for PIC code - disabling smbwrapper and smbsh echo No support for PIC code - disabling smbwrapper and smbsh
WRAPPROG="" WRAPPROG=""
WRAP="" WRAP=""
WRAP32=""
elif test x$ac_cv_func_syscall = xno; then elif test x$ac_cv_func_syscall = xno; then
AC_MSG_RESULT([No syscall() -- disabling smbwrapper and smbsh]) AC_MSG_RESULT([No syscall() -- disabling smbwrapper and smbsh])
WRAPPROG="" WRAPPROG=""
WRAP="" WRAP=""
WRAP32=""
fi fi
EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WRAPPROG $WRAP $WRAP32" EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WRAPPROG $WRAP"
SMBWRAPPER="$WRAPPROG $WRAP $WRAP32" SMBWRAPPER="$WRAPPROG $WRAP"
;; ;;
*) *)
AC_MSG_RESULT(no) AC_MSG_RESULT(no)