| |
| |
| @@ -20794,10 +20794,10 @@ |
| if test "$apu_have_sqlite3" = "1"; then |
| |
| if test "x$LDADD_dbd_sqlite3" = "x"; then |
| - test "x$silent" != "xyes" && echo " setting LDADD_dbd_sqlite3 to \"$sqlite3_LDFLAGS -lsqlite3\"" |
| - LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3" |
| + test "x$silent" != "xyes" && echo " setting LDADD_dbd_sqlite3 to \"$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1\"" |
| + LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1" |
| else |
| - apr_addto_bugger="$sqlite3_LDFLAGS -lsqlite3" |
| + apr_addto_bugger="$sqlite3_LDFLAGS -lsqlite3 -lapr-1 -L/home/vxp/midipix/nt64/debug/tmp/apr-util-1.5.4/.libs -laprutil-1" |
| for i in $apr_addto_bugger; do |
| apr_addto_duplicate="0" |
| for j in $LDADD_dbd_sqlite3; do |
| |
| |
| @@ -23,7 +23,7 @@ |
| INSTALL_DATA = @INSTALL_DATA@ |
| |
| APU_MODULES = @APU_MODULES@ |
| -LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR) |
| +LINK_MODULE = slibtool $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR) |
| APU_DSO_LIBDIR = @APU_DSO_LIBDIR@ |
| |
| LT_VERSION = @APU_LTVERSION@ |
| @@ -85,7 +85,7 @@ |
| list='$(INSTALL_SUBDIRS)'; for i in $$list; do \ |
| ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \ |
| done |
| - $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir) |
| + slibtool --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir) |
| $(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir) |
| $(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG) |
| |
| @@ -98,7 +98,7 @@ |
| |
| install-modules-yes: $(APU_MODULES) |
| $(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR) |
| - @for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done |
| + @for m in $(APU_MODULES); do slibtool $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 756 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done |
| |
| exports.c: $(HEADERS) |
| $(APR_MKEXPORT) $(HEADERS) > $@ |