]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Fix the POOBAD_CC on Slowaris so we can handle things correctly ...
authorRichard Sharpe <sharpe@samba.org>
Mon, 23 Jul 2001 11:22:29 +0000 (11:22 +0000)
committerRichard Sharpe <sharpe@samba.org>
Mon, 23 Jul 2001 11:22:29 +0000 (11:22 +0000)
Lets see how this goes.

source/Makefile.in
source/configure.in

index d81729e6b8ab37837b63fd0ef1f74a63abddc872..8e02400b98abcf033c660647570db7524b07e7e1 100644 (file)
@@ -450,8 +450,8 @@ MAKEDIR = || exec false; \
          dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
        @echo Compiling $*.c with @PICFLAG@
        @$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< -o $*.po
-@BROKEN_CC@    -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@.o
-     @mv $*.po.o $@
+@BROKEN_CC@    -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@.@PICSUFFIX@
+@POBAD_CC@     @mv $*.po.o $@
 
 # this is for IRIX
 .c.po32: 
index 138be6c27cfd17af09f59c4ef7bec1fc67a726da..8385be9d45293be690806aecbbfe666ece127ac8 100644 (file)
@@ -15,6 +15,8 @@ AC_SUBST(PAM_MOD)
 AC_SUBST(WRAP)
 AC_SUBST(WRAP32)
 AC_SUBST(PICFLAG)
+AC_SUBST(PICSUFFIX)
+AC_SUBST(POBAD_CC)
 AC_SUBST(SHLIBEXT)
 AC_SUBST(BLDSHARED)
 
@@ -609,6 +611,8 @@ HOST_OS="$host_os"
 LDSHFLAGS="-shared"
 SHLD="\${CC}"
 PICFLAG=""
+PICSUFFIX="po"
+POBAD_CC="#"
 SHLIBEXT="so"
 BLDSHARED="false"
 
@@ -622,7 +626,13 @@ case "$host_os" in
                *solaris*) AC_DEFINE(SUNOS5)
                        BLDSHARED="true"
                        LDSHFLAGS="-Wl,-soname,\$@ -shared"
-                       PICFLAG="-KPIC -xO4"
+                       if test "${ac_cv_prog_CC}" = "gcc"; then
+                               PICFLAG="-fPIC"
+                       else
+                               PICFLAG="-KPIC -xO4"
+                               POBAD_CC=""
+                               PICSUFFIX="po.o"
+                       fi
                ;;
                *sunos*) AC_DEFINE(SUNOS4)
                        BLDSHARED="true"