mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
enabled built in popt if system doesn't have it
(This used to be ctdb commit 30c8d69267a78e1d3dea0fcc936ee2939bb7a373)
This commit is contained in:
parent
317ad52758
commit
6c114bb1bd
@ -8,16 +8,20 @@ includedir = @includedir@
|
||||
libdir = @libdir@
|
||||
bindir = @bindir@
|
||||
localstatedir = @localstatedir@
|
||||
VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@
|
||||
VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
|
||||
srcdir = @srcdir@
|
||||
builddir = @builddir@
|
||||
EXTRA_OBJ=@EXTRA_OBJ@
|
||||
|
||||
POPT_LIBS = @POPT_LIBS@
|
||||
POPT_CFLAGS = @POPT_CFLAGS@
|
||||
POPT_OBJ = @POPT_OBJ@
|
||||
|
||||
CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
|
||||
-I@tallocdir@ -I@tdbdir@/include -I@libreplacedir@ \
|
||||
-DVARDIR=\"$(localstatedir)\" -DUSE_MMAP=1 @CFLAGS@
|
||||
-DVARDIR=\"$(localstatedir)\" -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
|
||||
|
||||
LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ -lpopt @INFINIBAND_LIBS@
|
||||
LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@
|
||||
|
||||
EVENTS_OBJ = lib/events/events.o lib/events/events_standard.o \
|
||||
lib/events/events_signal.o lib/events/events_timed.o
|
||||
@ -32,7 +36,7 @@ CTDB_COMMON_OBJ = common/ctdb.o common/ctdb_daemon.o common/ctdb_client.o \
|
||||
|
||||
CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
|
||||
|
||||
CTDB_OBJ = $(CTDB_COMMON_OBJ) $(CTDB_TCP_OBJ)
|
||||
CTDB_OBJ = $(CTDB_COMMON_OBJ) $(CTDB_TCP_OBJ) $(POPT_OBJ)
|
||||
|
||||
OBJS = @TDB_OBJ@ @TALLOC_OBJ@ @LIBREPLACEOBJ@ @INFINIBAND_WRAPPER_OBJ@ $(EXTRA_OBJ) $(EVENTS_OBJ) $(CTDB_OBJ) $(UTIL_OBJ)
|
||||
|
||||
|
@ -24,6 +24,7 @@ AC_CONFIG_HEADER(config.h)
|
||||
|
||||
EXTRA_OBJ=""
|
||||
|
||||
m4_include(libpopt.m4)
|
||||
m4_include(libtalloc.m4)
|
||||
m4_include(libtdb.m4)
|
||||
m4_include(ib/config.m4)
|
||||
|
@ -37,7 +37,7 @@ if test x"$INCLUDED_POPT" != x"no"; then
|
||||
if test x"$poptdir" = "x"; then
|
||||
AC_MSG_ERROR([cannot find popt source in $poptpaths])
|
||||
fi
|
||||
POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
|
||||
AC_SUBST(POPTOBJ)
|
||||
POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
|
||||
AC_SUBST(POPT_OBJ)
|
||||
AC_CHECK_HEADERS([float.h alloca.h])
|
||||
fi
|
||||
|
@ -1,6 +1,6 @@
|
||||
m4_include(lib/popt/libpopt.m4)
|
||||
|
||||
if test x"$POPTOBJ" = "x"; then
|
||||
if test x"$POPT_OBJ" = "x"; then
|
||||
SMB_EXT_LIB(LIBPOPT, [${POPT_LIBS}])
|
||||
SMB_ENABLE(LIBPOPT,YES)
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user