Merge of POBAD_CC removal from 3.0

(This used to be commit 835a28337f97da143d5b9201a5080fde06bbedf1)

diff --git a/examples/VFS/configure.in b/examples/VFS/configure.in
index a0d1dc96301e1a2e531105f0ef0f49f67f1d5f48..3799e3a5075b670c5ba501fcbc6801816acb7f5c 100644 (file)
--- a/examples/VFS/configure.in
+++ b/examples/VFS/configure.in
@@ -55,7 +55,6 @@ AC_SUBST(SHLD)
 AC_SUBST(HOST_OS)
 AC_SUBST(PICFLAG)
 AC_SUBST(PICSUFFIX)
-AC_SUBST(POBAD_CC)
 AC_SUBST(SHLIBEXT)
 AC_SUBST(INSTALLCLIENTCMD_SH)
 AC_SUBST(INSTALLCLIENTCMD_A)
@@ -181,7 +180,6 @@ SONAMEFLAG="#"
 SHLD="\${CC}"
 PICFLAG=""
 PICSUFFIX="po"
-POBAD_CC="#"
 SHLIBEXT="so"
 
 if test "$enable_shared" = "yes"; then
@@ -214,7 +212,6 @@ if test "$enable_shared" = "yes"; then
                                ## ${CFLAGS} added for building 64-bit shared 
                                ## libs using Sun's Compiler
                                LDSHFLAGS="-G \${CFLAGS}"
-                               POBAD_CC=""
                                PICSUFFIX="po.o"
                        fi
                        ;;

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 68aead0fc2a491be61476aa52fd624b6a85c2756..1bd3392f02e99bd79bf48ea1e353a693674e1b0e 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -754,7 +754,6 @@ dynconfig.@PICSUFFIX@: dynconfig.c Makefile
        @echo Compiling $*.c with @PICFLAGS@
        @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $< -o $*.@PICSUFFIX@
 @BROKEN_CC@    -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.@PICSUFFIX@$$%.o%'` $@
-@POBAD_CC@     -@mv $*.@PICSUFFIX@.o $@
 
 lib/version.o: lib/version.c include/version.h
        @echo Compiling $*.c
@@ -766,7 +765,6 @@ lib/version.@PICSUFFIX@: lib/version.c include/version.h
        @echo Compiling $*.c with @PICFLAGS@
        @$(CC) -I. -I$(srcdir) $(FLAGS) $(PATH_FLAGS) @PICFLAGS@ -c $< -o $*.@PICSUFFIX@
 @BROKEN_CC@    -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.@PICSUFFIX@$$%.o%'` $@
-@POBAD_CC@     @mv $*.@PICSUFFIX@.o $@
 
 smbd/build_options.o: smbd/build_options.c Makefile include/config.h include/build_env.h include/proto.h
        @echo Compiling $*.c
@@ -782,7 +780,6 @@ smbd/build_options.c: include/config.h.in script/mkbuildoptions.awk
        @echo Compiling $*.c with @PICFLAGS@
        @$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAGS@ -c $< -o $*.@PICSUFFIX@
 @BROKEN_CC@    -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.@PICSUFFIX@$$%.o%'` $@
-@POBAD_CC@     @mv $*.@PICSUFFIX@.o $@
 
 bin/.dummy:
        @if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \

diff --git a/source3/configure.in b/source3/configure.in
index 07e4f3476f76647e69bbeb6174474e1f040c516e..cf695eb05cfe4dc5f4ff82a7dc6c4917c5c203de 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -163,7 +163,6 @@ AC_SUBST(SHLD)
 AC_SUBST(HOST_OS)
 AC_SUBST(PICFLAGS)
 AC_SUBST(PICSUFFIX)
-AC_SUBST(POBAD_CC)
 AC_SUBST(SHLIBEXT)
 AC_SUBST(INSTALLCLIENT)
 AC_SUBST(INSTALLCLIENTCMD_SH)
@@ -1063,7 +1062,6 @@ SONAMEFLAG="#"
 SHLD="\${CC} \${CFLAGS}"
 PICFLAGS=""
 PICSUFFIX="po"
-POBAD_CC="#"
 SHLIBEXT="so"
 
 if test "$enable_shared" = "yes"; then
@@ -1097,7 +1095,6 @@ if test "$enable_shared" = "yes"; then
                                ## ${CFLAGS} added for building 64-bit shared 
                                ## libs using Sun's Compiler
                                LDSHFLAGS="-G \${CFLAGS}"
-                               POBAD_CC=""
                                PICSUFFIX="po.o"
                        fi
                        AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])