fix arbitrary precision number display when no big number library is available

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 8c5ed6218942206882390965d91b8830b923001f..4fb79fd8954c7272304337d08c5b4d2c83abef8a 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -23,7 +23,7 @@ SUBDIRS=back-* shell-backends slapi overlays
 NT_SRCS = nt_svc.c
 NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res
 
-SRCS   = main.c globals.c config.c daemon.c \
+SRCS   = main.c globals.c bconfig.c config.c daemon.c \
                connection.c search.c filter.c add.c cr.c \
                attr.c entry.c backend.c result.c operation.c \
                dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
@@ -40,9 +40,9 @@ SRCS  = main.c globals.c config.c daemon.c \
                slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
                $(@PLAT@_SRCS)
 
-OBJS   = main.o globals.o config.o daemon.o \
+OBJS   = main.o globals.o bconfig.o config.o daemon.o \
                connection.o search.o filter.o add.o cr.o \
-               attr.o entry.o backend.o result.o operation.o \
+               attr.o entry.o backend.o backends.o result.o operation.o \
                dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
                value.o ava.o bind.o unbind.o abandon.o filterentry.o \
                phonetic.o acl.o str2filter.o aclparse.o init.o user.o \
@@ -61,7 +61,7 @@ LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/slapi -I.
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a
+SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a liboverlays.a
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
 
@@ -70,7 +70,7 @@ SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
 
-XLIBS = $(SLAPD_STATIC_DEPENDS) liboverlays.a $(SLAPD_L)
+XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
 XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS) $(MODULES_LIBS)
 
@@ -80,12 +80,12 @@ BUILD_SRV = @BUILD_SLAPD@
 all-local-srv: all-cffiles
 
 NT_SLAPD_DEPENDS = slapd.exp
-NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) backends.o version.o
+NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o
 
-UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) backends.o version.o $(SLAPD_L)
-UNIX_SLAPD_OBJECTS = $(OBJS) backends.o version.o
+UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) version.o $(SLAPD_L)
+UNIX_SLAPD_OBJECTS = $(OBJS) version.o
 
-SLAPD_DEPENDS = liboverlays.a $(@PLAT@_SLAPD_DEPENDS)
+SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS)
 SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 
 # Notes about slapd for Windows
@@ -189,6 +189,13 @@ slapd.def: libbackends.a liboverlays.a version.o
                    done; \
                    test -z "$$obj" && continue; \
                    ;; \
+               *.la) \
+                   if test -n "$LTSTATIC"; then \
+                           base=`expr "$$i" : ".*/\(.*\).la"`; \
+                           path=`expr "$$i" : "\(.*/\).*"`; \
+                           obj=$$path.libs/$$base.a; \
+                   fi; \
+                   ;; \
                *.o | *.a) \
                    obj=$$i; \
            esac; \
@@ -262,13 +269,16 @@ slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
                $(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
 
 
-sslapd: version.o backends.o
-       $(LTLINK) -static -o $@ $(OBJS) version.o backends.o $(LIBS) $(WRAP_LIBS)
+sslapd: version.o
+       $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
 dummy $(SLAPD_DYNAMIC_BACKENDS): slapd
        cd $@; $(MAKE) $(MFLAGS) all
        @touch $@
 
+dynamic_overlays: slapd
+       cd overlays; $(MAKE) $(MFLAGS) dynamic
+
 #
 # In Windows, dynamic backends have to be built after slapd. For this
 # reason, we only build static backends now and dynamic backends later.
@@ -311,7 +321,7 @@ libbackends.a: .backend
        @ls -l libbackends.a; echo ""
 
 liboverlays.a: FORCE
-       @cd overlays; $(MAKE) $(MFLAGS) all
+       cd overlays; $(MAKE) $(MFLAGS) static
 
 version.c: Makefile
        @-$(RM) $@
@@ -361,7 +371,7 @@ install-local-srv: install-slapd install-tools \
 install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(libexecdir)
        -$(MKDIR) $(DESTDIR)$(localstatedir)/run
-       $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
+       $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
                slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
        @for i in $(SUBDIRS); do \
            if test -d $$i -a -f $$i/Makefile ; then \
@@ -371,7 +381,7 @@ install-slapd: FORCE
            fi; \
        done
 
-all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS)
+all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) dynamic_overlays
        @if test $(PLAT) = NT; then \
            sysconfdir=`cygpath -w $(sysconfdir) | \
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \