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

n32 so smbwrapper fails to link.
(This used to be commit 392f207a353c3c154ea04a284c4e54864a927e95)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 32da7c7c2418db3f3a28ffc54241075456d10713..8b4e7bdb1398c307c68a2957d51bdfd7287601ae 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -106,7 +106,6 @@ FLAGS3 =
 FLAGS4 = 
 FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
 FLAGS  = $(ISA) $(FLAGS5) 
-FLAGS32  = $(ISA32) $(FLAGS5)
 
 PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
 PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
@@ -661,7 +660,6 @@ everything: all libsmbclient debug2html smbfilter talloctort modules torture
 
 SHOWFLAGS:
        @echo "Using FLAGS = $(FLAGS)"
-       @echo "      FLAGS32 = $(FLAGS32)"
        @echo "      LIBS = $(LIBS)"
        @echo "      LDSHFLAGS = $(LDSHFLAGS)"
        @echo "      LDFLAGS = $(LDFLAGS)"
@@ -881,11 +879,6 @@ bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy
        @$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \
                @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)
        @echo Linking libsmbclient shared library $@
        @$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \

diff --git a/source3/configure.in b/source3/configure.in
index a90721c152b522bc0d3fc5b825ba9cce5ee1ac2f..c81712da5cf774e9603d80da69b3d58f242532c5 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1024,7 +1024,6 @@ if test "$enable_shared" = "yes"; then
                        *irix6*) AC_DEFINE(IRIX6,1,[Whether the host os is irix6])
                        ;;
                        esac
-                       ATTEMPT_WRAP32_BUILD=yes
                        BLDSHARED="true"
                        LDSHFLAGS="-set_version sgi1.0 -shared"
                        SONAMEFLAG="-soname "
@@ -2035,27 +2034,19 @@ AC_ARG_WITH(smbwrapper,
        WRAPPROG="bin/smbsh\$(EXEEXT)"
        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.
 
        if test x$PICFLAG = x; then
           echo No support for PIC code - disabling smbwrapper and smbsh
           WRAPPROG=""
           WRAP=""
-          WRAP32=""
        elif test x$ac_cv_func_syscall = xno; then
           AC_MSG_RESULT([No syscall() -- disabling smbwrapper and smbsh])
           WRAPPROG=""
           WRAP=""
-          WRAP32=""
        fi
-       EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WRAPPROG $WRAP $WRAP32"
-       SMBWRAPPER="$WRAPPROG $WRAP $WRAP32"
+       EXTRA_ALL_TARGETS="$EXTRA_ALL_TARGETS $WRAPPROG $WRAP"
+       SMBWRAPPER="$WRAPPROG $WRAP"
     ;;
   *)
     AC_MSG_RESULT(no)