diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-01-07 11:42:12 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-01-07 11:42:12 +0000 |
| commit | 6c14b8c387cb66188c710d2b53cf1e4ccd159be5 (patch) | |
| tree | fd9adb21362f4df5aebf0e06f97f8e3af44ddcf6 | |
| parent | 17729f5dc5aa4a19fd2cdfed12f86da3e9d07ecc (diff) | |
| download | samba-6c14b8c387cb66188c710d2b53cf1e4ccd159be5.tar.gz samba-6c14b8c387cb66188c710d2b53cf1e4ccd159be5.tar.bz2 samba-6c14b8c387cb66188c710d2b53cf1e4ccd159be5.zip | |
- 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 c98158f3f818118fb13cc7ae6f45634204343b46)
| -rw-r--r-- | source3/Makefile.in | 5 | ||||
| -rwxr-xr-x | source3/configure | 4 | ||||
| -rw-r--r-- | source3/configure.in | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index dacc947d61..5688cf2d62 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -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 = diff --git a/source3/configure b/source3/configure index 33ceb1b97b..fc515f70e1 100755 --- a/source3/configure +++ b/source3/configure @@ -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 diff --git a/source3/configure.in b/source3/configure.in index 46b82af4b2..2340a1129c 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -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) |