mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
- use CFLAGS when linking shared libs (for things like -64 on irix)
- don't attempt to build winbindd if we can't do shared libs
(This used to be commit c98158f3f8
)
This commit is contained in:
parent
17729f5dc5
commit
6c14b8c387
@ -12,9 +12,8 @@ LIBS=@LIBS@
|
||||
CC=@CC@
|
||||
SHLD=@SHLD@
|
||||
CFLAGS=@CFLAGS@
|
||||
CPPFLAGS=@CPPFLAGS@
|
||||
LDFLAGS=@LDFLAGS@
|
||||
LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
|
||||
LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @CFLAGS@
|
||||
AWK=@AWK@
|
||||
|
||||
TERMLDFLAGS=@TERMLDFLAGS@
|
||||
@ -69,7 +68,7 @@ LOCKDIR = @lockdir@
|
||||
# man pages language(s)
|
||||
man_langs = "@manlangs@"
|
||||
|
||||
FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -I. -I$(srcdir)
|
||||
FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper -I. -I$(srcdir)
|
||||
FLAGS2 =
|
||||
FLAGS3 =
|
||||
FLAGS4 =
|
||||
|
4
source3/configure
vendored
4
source3/configure
vendored
@ -8712,7 +8712,7 @@ else
|
||||
ac_cv_shlib_works=no
|
||||
# try building a trivial shared library
|
||||
$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
|
||||
$CC $LDSHFLAGS -o shlib.so shlib.po &&
|
||||
$CC $CPPFLAGS $CFLAGS $LDSHFLAGS -o shlib.so shlib.po &&
|
||||
ac_cv_shlib_works=yes
|
||||
rm -f shlib.so shlib.po
|
||||
|
||||
@ -13313,7 +13313,7 @@ fi
|
||||
|
||||
# Display test results
|
||||
|
||||
if test x"$HAVE_WINBIND" = x"yes"; then
|
||||
if test x"$HAVE_WINBIND" = x"yes" && test x"$BLDSHARED" = x"true"; then
|
||||
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
|
@ -782,7 +782,7 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
|
||||
ac_cv_shlib_works=no
|
||||
# try building a trivial shared library
|
||||
$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.po ${srcdir-.}/tests/shlib.c &&
|
||||
$CC $LDSHFLAGS -o shlib.so shlib.po &&
|
||||
$CC $CPPFLAGS $CFLAGS $LDSHFLAGS -o shlib.so shlib.po &&
|
||||
ac_cv_shlib_works=yes
|
||||
rm -f shlib.so shlib.po
|
||||
])
|
||||
@ -2538,7 +2538,7 @@ fi
|
||||
|
||||
# Display test results
|
||||
|
||||
if test x"$HAVE_WINBIND" = x"yes"; then
|
||||
if test x"$HAVE_WINBIND" = x"yes" && test x"$BLDSHARED" = x"true"; then
|
||||
|
||||
AC_MSG_RESULT(yes)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user