summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2001-07-23 11:22:29 +0000
committerRichard Sharpe <sharpe@samba.org>2001-07-23 11:22:29 +0000
commit022db351e8c6599d5ccd238ab7eca6b1d8c8d77a (patch)
tree572052c44afae1ae904cec8f6b53b07024bd99da /source3
parent6a3132d876fe9f0f53115eb2c472e6a9b6e40df3 (diff)
downloadsamba-022db351e8c6599d5ccd238ab7eca6b1d8c8d77a.tar.gz
samba-022db351e8c6599d5ccd238ab7eca6b1d8c8d77a.tar.bz2
samba-022db351e8c6599d5ccd238ab7eca6b1d8c8d77a.zip
Fix the POOBAD_CC on Slowaris so we can handle things correctly ...
Lets see how this goes. (This used to be commit d63b03f7536abb0745ad2a084c44108a3c19a8b6)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in4
-rw-r--r--source3/configure.in12
2 files changed, 13 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d81729e6b8..8e02400b98 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -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:
diff --git a/source3/configure.in b/source3/configure.in
index 138be6c27c..8385be9d45 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -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"