* samba/configure.in: Don't check for things that are unused.
Remove support for building shared libraries. * samba/Makefile.in: Remove support for shared libraries and quota.
Этот коммит содержится в:
Pavel Roskin
родитель
ea257f662a
Коммит
2586b393e1
@ -1,5 +1,10 @@
|
||||
2001-02-09 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* samba/configure.in: Don't check for things that are unused.
|
||||
Remove support for building shared libraries.
|
||||
* samba/Makefile.in: Remove support for shared libraries and
|
||||
quota.
|
||||
|
||||
* samba/configure.in: Don't check for any 64-bit functions and
|
||||
syscall() - they are not needed.
|
||||
|
||||
|
||||
@ -80,8 +80,6 @@ PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup bin/make_printerdef
|
||||
|
||||
SCRIPTS = $(srcdir)/script/smbtar $(srcdir)/script/addtosmbpass $(srcdir)/script/convert_smbpasswd
|
||||
|
||||
QUOTAOBJS=@QUOTAOBJS@
|
||||
|
||||
######################################################################
|
||||
# object file lists
|
||||
######################################################################
|
||||
@ -239,9 +237,6 @@ SMBFILTER_OBJ = utils/smbfilter.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
|
||||
PROTO_OBJ = $(CLIENT_OBJ) \
|
||||
$(RPCCLIENT_OBJ) $(SMBWRAPPER_OBJ) $(SMBTORTURE_OBJ)
|
||||
|
||||
PICOBJS = $(SMBWRAPPER_OBJ:.o=.po)
|
||||
PICOBJS32 = $(SMBWRAPPER_OBJ:.o=.po32)
|
||||
|
||||
######################################################################
|
||||
# now the rules...
|
||||
######################################################################
|
||||
@ -259,7 +254,7 @@ debug2html : CHECK bin/debug2html
|
||||
smbfilter : CHECK bin/smbfilter
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o .po .po32
|
||||
.SUFFIXES: .c .o
|
||||
|
||||
CHECK:
|
||||
@echo "Using FLAGS = $(FLAGS)"
|
||||
@ -291,37 +286,6 @@ MAKEDIR = || exec false; \
|
||||
@MAINT@ <.deps/$@ >.deps/$@d && \
|
||||
@MAINT@ rm -f .deps/$@ && : >.deps/.stamp
|
||||
|
||||
.c.po: @MAINT@ .deps/.dummy
|
||||
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
|
||||
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
|
||||
@MAINT@ @if (: >> .deps/$@ || : > .deps/$@) >/dev/null 2>&1; then :; \
|
||||
@MAINT@ else dir=.deps/`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` \
|
||||
@MAINT@ $(MAKEDIR); fi; rm -f .deps/$@ .deps/$@d
|
||||
@echo Compiling $*.c with @PICFLAG@
|
||||
@$(CC) -I. -I$(srcdir) $(FLAGS) @PICFLAG@ -c $< \
|
||||
-o $*.po.o @MAINT@ -Wp,-MD,.deps/$@
|
||||
@BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@.o
|
||||
@MAINT@ @sed 's|^'`echo $*\.po\.o | sed 's,.*/,,'`':|$@:|' \
|
||||
@MAINT@ <.deps/$@ >.deps/$@d && \
|
||||
@MAINT@ rm -f .deps/$@ && : >.deps/.stamp
|
||||
@mv $*.po.o $@
|
||||
|
||||
# this is for IRIX
|
||||
.c.po32: @MAINT@ .deps/.dummy
|
||||
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
|
||||
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
|
||||
@MAINT@ @if (: >> .deps/$@ || : > .deps/$@) >/dev/null 2>&1; then :; \
|
||||
@MAINT@ else dir=.deps/`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` \
|
||||
@MAINT@ $(MAKEDIR); fi; rm -f .deps/$@ .deps/$@d
|
||||
@echo Compiling $*.c with @PICFLAG@ and -32
|
||||
@$(CC) -32 -I. -I$(srcdir) $(FLAGS32) @PICFLAG@ -c $< \
|
||||
-o $*.po32.o @MAINT@ -Wp,-MD,.deps/$@
|
||||
@BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po32$$%.o%'` $@.o
|
||||
@MAINT@ @sed 's|^'`echo $*.po32.o | sed 's,.*/,,'`':|$@:|' \
|
||||
@MAINT@ <.deps/$@ >.deps/$@d && \
|
||||
@MAINT@ rm -f .deps/$@ && : >.deps/.stamp
|
||||
@mv $*.po32.o $@
|
||||
|
||||
bin/.dummy:
|
||||
@if (: >> $@ || : > $@) >/dev/null 2>&1; then :; else \
|
||||
dir=bin $(MAKEDIR); fi
|
||||
@ -395,14 +359,6 @@ bin/smbfilter: $(SMBFILTER_OBJ) bin/.dummy
|
||||
@echo Linking $@
|
||||
@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS)
|
||||
|
||||
bin/smbwrapper.so: $(PICOBJS)
|
||||
@echo Linking shared library $@
|
||||
@$(LD) @LDSHFLAGS@ -o $@ $(PICOBJS) $(LIBS)
|
||||
|
||||
bin/smbwrapper.32.so: $(PICOBJS32)
|
||||
@echo Linking shared library $@
|
||||
@$(LD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
|
||||
|
||||
bin/smbsh: $(SMBSH_OBJ) bin/.dummy
|
||||
@echo Linking $@
|
||||
@$(CC) $(FLAGS) -o $@ $(SMBSH_OBJ) $(LDFLAGS) $(LIBS)
|
||||
@ -453,7 +409,7 @@ uninstallcp:
|
||||
@$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
|
||||
|
||||
clean:
|
||||
-rm -f core */*~ *~ */*.o */*.po */*.po32 */*.so bin/*
|
||||
-rm -f core */*~ *~ */*.o */*.so bin/*
|
||||
|
||||
proto:
|
||||
@echo rebuilding include/proto.h
|
||||
|
||||
@ -12,7 +12,6 @@ AC_SUBST(LDSHFLAGS)
|
||||
AC_SUBST(HOST_OS)
|
||||
AC_SUBST(WRAP)
|
||||
AC_SUBST(WRAP32)
|
||||
AC_SUBST(PICFLAG)
|
||||
|
||||
# compile with optimisation and without debugging by default
|
||||
CFLAGS=${CFLAGS-"-O"}
|
||||
@ -41,128 +40,10 @@ fi
|
||||
|
||||
|
||||
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_CANONICAL_HOST
|
||||
AC_VALIDATE_CACHE_SYSTEM_TYPE
|
||||
SAMBA_MAINTAINER_MODE
|
||||
|
||||
#
|
||||
# Config CPPFLAG settings for strange OS's that must be set
|
||||
# before other tests.
|
||||
#
|
||||
case "$host_os" in
|
||||
# Try to work out if this is the native HPUX compiler that uses the -Ae flag.
|
||||
*hpux*)
|
||||
AC_PROG_CC_FLAG(Ae)
|
||||
if test $ac_cv_prog_cc_Ae = yes; then
|
||||
CPPFLAGS="$CPPFLAGS -Ae"
|
||||
fi
|
||||
#
|
||||
# Defines needed for HPUX support.
|
||||
# HPUX has bigcrypt but (sometimes?) doesn't use it for
|
||||
# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
|
||||
#
|
||||
case `uname -r` in
|
||||
*9*|*10*)
|
||||
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_POSIX_SOURCE"
|
||||
AC_DEFINE(USE_BOTH_CRYPT_CALLS)
|
||||
;;
|
||||
*11*)
|
||||
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_POSIX_SOURCE -D_LARGEFILE64_SOURCE"
|
||||
AC_DEFINE(USE_BOTH_CRYPT_CALLS)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
#
|
||||
# AIX4.x doesn't even admit to having large
|
||||
# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
|
||||
#
|
||||
*aix4*)
|
||||
AC_MSG_RESULT([enabling large file support])
|
||||
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
|
||||
;;
|
||||
#
|
||||
# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
|
||||
# to the existance of large files..
|
||||
# Note that -D_LARGEFILE64_SOURCE is different from the Sun
|
||||
# recommendations on large file support, however it makes the
|
||||
# compile work using gcc 2.7 and 2.8, whereas using the Sun
|
||||
# recommendation makes the compile fail on gcc2.7. JRA.
|
||||
#
|
||||
*solaris*)
|
||||
case `uname -r` in
|
||||
5.6*|5.7*)
|
||||
AC_MSG_RESULT([enabling large file support])
|
||||
if test "$ac_cv_prog_gcc" = yes; then
|
||||
${CC-cc} -v >conftest.c 2>&1
|
||||
ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
|
||||
rm -fr conftest.c
|
||||
case "$ac_cv_gcc_compiler_version_number" in
|
||||
*"gcc version 2.6"*|*"gcc version 2.7"*)
|
||||
CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
|
||||
;;
|
||||
*)
|
||||
CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
#
|
||||
# Tests needed for SINIX large file support.
|
||||
#
|
||||
*sysv4*)
|
||||
if test $host = mips-sni-sysv4 ; then
|
||||
AC_MSG_CHECKING([for LFS support])
|
||||
old_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
|
||||
AC_TRY_RUN([
|
||||
#include <unistd.h>
|
||||
main () {
|
||||
#if _LFS64_LARGEFILE == 1
|
||||
exit(0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
}], [SINIX_LFS_SUPPORT=yes], [SINIX_LFS_SUPPORT=no], [SINIX_LFS_SUPPORT=cross])
|
||||
CPPFLAGS="$old_CPPFLAGS"
|
||||
if test x$SINIX_LFS_SUPPORT = xyes ; then
|
||||
CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
|
||||
CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
|
||||
LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
|
||||
LIBS="`getconf LFS64_LIBS` $LIBS"
|
||||
fi
|
||||
AC_MSG_RESULT([$SINIX_LFS_SUPPORT])
|
||||
fi
|
||||
;;
|
||||
|
||||
#
|
||||
# Tests needed for glibc 2.1 large file support.
|
||||
#
|
||||
*linux*|*hurd*)
|
||||
AC_MSG_CHECKING([for LFS support])
|
||||
old_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
|
||||
AC_TRY_RUN([
|
||||
#include <unistd.h>
|
||||
main () {
|
||||
#if _LFS64_LARGEFILE == 1
|
||||
exit(0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
}], [GLIBC_LFS_SUPPORT=yes], [GLIBC_LFS_SUPPORT=no], [GLIBC_LFS_SUPPORT=cross])
|
||||
CPPFLAGS="$old_CPPFLAGS"
|
||||
if test x$GLIBC_LFS_SUPPORT = xyes ; then
|
||||
CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
|
||||
fi
|
||||
AC_MSG_RESULT([$GLIBC_LFS_SUPPORT])
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
AC_INLINE
|
||||
AC_HEADER_STDC
|
||||
AC_HEADER_DIRENT
|
||||
@ -175,20 +56,7 @@ AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/m
|
||||
AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h string.h strings.h stdlib.h sys/socket.h)
|
||||
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
|
||||
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
|
||||
#
|
||||
# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
|
||||
# This causes configure to fail to detect it. Check for shadow separately on HPUX.
|
||||
#
|
||||
case "$host_os" in
|
||||
*hpux*)
|
||||
AC_TRY_COMPILE([#include <shadow.h>],[struct spwd testme],
|
||||
ac_cv_header_shadow_h=yes,ac_cv_header_shadow_h=no)
|
||||
if test x"$ac_cv_header_shadow_h" = x"yes"; then
|
||||
AC_DEFINE(HAVE_SHADOW_H)
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
AC_CHECK_HEADERS(shadow.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
|
||||
AC_CHECK_HEADERS(netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
|
||||
AC_CHECK_HEADERS(sys/security.h security/pam_appl.h)
|
||||
AC_CHECK_HEADERS(stropts.h poll.h readline.h history.h readline/readline.h)
|
||||
AC_CHECK_HEADERS(readline/history.h sys/capability.h syscall.h sys/syscall.h)
|
||||
@ -318,18 +186,8 @@ AC_CHECK_FUNCS(atexit grantpt dup2)
|
||||
AC_CHECK_FUNCS(setluid yp_get_default_domain getpwanam)
|
||||
AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp)
|
||||
|
||||
AC_CHECK_FUNCS(_dup _dup2 _opendir _readdir _seekdir _telldir _closedir)
|
||||
AC_CHECK_FUNCS(__dup __dup2 __opendir __readdir __seekdir __telldir __closedir)
|
||||
AC_CHECK_FUNCS(__getcwd _getcwd)
|
||||
AC_CHECK_FUNCS(__xstat __fxstat __lxstat)
|
||||
AC_CHECK_FUNCS(_stat _lstat _fstat __stat __lstat __fstat)
|
||||
AC_CHECK_FUNCS(_acl __acl _facl __facl _open __open _chdir __chdir)
|
||||
AC_CHECK_FUNCS(_close __close _fchdir __fchdir _fcntl __fcntl)
|
||||
AC_CHECK_FUNCS(getdents _getdents __getdents _lseek __lseek _read __read)
|
||||
AC_CHECK_FUNCS(_write __write _fork __fork)
|
||||
AC_CHECK_FUNCS(__sys_llseek llseek _llseek __llseek)
|
||||
AC_CHECK_FUNCS(pread _pread __pread)
|
||||
AC_CHECK_FUNCS(pwrite _pwrite __pwrite)
|
||||
AC_CHECK_FUNCS(getdents)
|
||||
AC_CHECK_FUNCS(llseek)
|
||||
|
||||
#
|
||||
# If no strcasecmp, check for it in some known places
|
||||
@ -414,25 +272,6 @@ case "$host_os" in
|
||||
;;
|
||||
esac
|
||||
|
||||
# try to work out how to produce pic code with this compiler
|
||||
PICFLAG=""
|
||||
AC_PROG_CC_FLAG(fpic)
|
||||
if test $ac_cv_prog_cc_fpic = yes; then
|
||||
PICFLAG="-fpic";
|
||||
fi
|
||||
if test x$PICFLAG = x; then
|
||||
AC_PROG_CC_FLAG(Kpic)
|
||||
if test $ac_cv_prog_cc_Kpic = yes; then
|
||||
PICFLAG="-Kpic";
|
||||
fi
|
||||
fi
|
||||
if test x$PICFLAG = x; then
|
||||
AC_PROG_CC_FLAG(KPIC)
|
||||
if test $ac_cv_prog_cc_KPIC = yes; then
|
||||
PICFLAG="-KPIC";
|
||||
fi
|
||||
fi
|
||||
|
||||
################
|
||||
|
||||
AC_CACHE_CHECK([for long long],samba_cv_have_longlong,[
|
||||
@ -1110,24 +949,6 @@ AC_ARG_WITH(ssl,
|
||||
)
|
||||
|
||||
|
||||
#################################################
|
||||
# check for experimental mmap support
|
||||
AC_MSG_CHECKING([whether to use MMAP])
|
||||
AC_ARG_WITH(mmap,
|
||||
[ --with-mmap Include experimental MMAP support
|
||||
--without-mmap Don't include MMAP support (default)],
|
||||
[ case "$withval" in
|
||||
yes)
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(WITH_MMAP)
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(no)
|
||||
;;
|
||||
esac ],
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
#################################################
|
||||
# check for syslog logging
|
||||
AC_MSG_CHECKING([whether to use syslog logging])
|
||||
@ -1146,45 +967,6 @@ AC_ARG_WITH(syslog,
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
#################################################
|
||||
# check for experimental netatalk resource fork support
|
||||
AC_MSG_CHECKING([whether to support netatalk])
|
||||
AC_ARG_WITH(netatalk,
|
||||
[ --with-netatalk Include experimental Netatalk support
|
||||
--without-netatalk Don't include experimental Netatalk support (default)],
|
||||
[ case "$withval" in
|
||||
yes)
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(WITH_NETATALK)
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(no)
|
||||
;;
|
||||
esac ],
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
|
||||
#################################################
|
||||
# check for experimental disk-quotas support
|
||||
QUOTAOBJS=noquotas.o
|
||||
|
||||
AC_MSG_CHECKING([whether to support disk-quotas])
|
||||
AC_ARG_WITH(quotas,
|
||||
[ --with-quotas Include experimental disk-quota support
|
||||
--without-quotas Don't include experimental disk-quota support (default)],
|
||||
[ case "$withval" in
|
||||
yes)
|
||||
AC_MSG_RESULT(yes)
|
||||
QUOTAOBJS=quotas.o
|
||||
;;
|
||||
*)
|
||||
AC_MSG_RESULT(no)
|
||||
;;
|
||||
esac ],
|
||||
AC_MSG_RESULT(no)
|
||||
)
|
||||
AC_SUBST(QUOTAOBJS)
|
||||
|
||||
#################################################
|
||||
# set private directory location
|
||||
AC_ARG_WITH(privatedir,
|
||||
@ -1227,27 +1009,6 @@ AC_ARG_WITH(lockdir,
|
||||
AC_SUBST(lockdir)]
|
||||
)
|
||||
|
||||
#################################################
|
||||
# set SWAT directory location
|
||||
AC_ARG_WITH(swatdir,
|
||||
[ --with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat)],
|
||||
[ case "$withval" in
|
||||
yes|no)
|
||||
#
|
||||
# Just in case anybody does it
|
||||
#
|
||||
AC_MSG_WARN([--with-swatdir called without argument - will use default])
|
||||
swatdir='${prefix}/swat'
|
||||
;;
|
||||
* )
|
||||
swatdir="$withval"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(swatdir)],
|
||||
[swatdir='${prefix}/swat'
|
||||
AC_SUBST(swatdir)]
|
||||
)
|
||||
|
||||
AC_MSG_CHECKING([configure summary])
|
||||
AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"],
|
||||
AC_MSG_RESULT(OK);,
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user