1 --- lftp-2.6.5/src/module.cc~ Sat Apr 19 08:38:36 2003
2 +++ lftp-2.6.5/src/module.cc Sat Apr 19 08:38:36 2003
5 module_info *module_info::base;
7 -static ResDecl res_mod_path("module:path", PKGLIBDIR"/"VERSION":"PKGLIBDIR, 0,0);
8 +static ResDecl res_mod_path("module:path", PKGLIBDIR, 0,0);
10 void *module_load(const char *path,int argc,const char *const *argv)
16 - sprintf(fullpath,"%s/%s/%s.so",PKGLIBDIR,VERSION,path); // fallback
17 + sprintf(fullpath,"%s/%s.so",PKGLIBDIR,path); // fallback
19 map=dlopen(fullpath,DLOPEN_FLAGS); // LAZY?
21 --- lftp-2.6.5/src/Makefile.am~ Sat Apr 19 09:26:05 2003
22 +++ lftp-2.6.5/src/Makefile.am Sat Apr 19 09:26:05 2003
24 #ftpget_SOURCES = ftpget.cc
26 EXTRA_LTLIBRARIES = libnetwork.la proto-ftp.la proto-http.la proto-file.la cmd-mirror.la cmd-sleep.la proto-fish.la
27 -pkgverlib_LTLIBRARIES = $(MODULES_LA)
28 +pkglib_LTLIBRARIES = $(MODULES_LA)
29 noinst_LTLIBRARIES = $(MODULES_LA_STATIC) libtasks.la libjobs.la
31 proto_ftp_la_SOURCES = ftpclass.cc ftpclass.h FtpListInfo.cc FtpListInfo.h\
33 libnetwork_la_SOURCES = NetAccess.cc NetAccess.h Resolver.cc Resolver.h\
34 lftp_ssl.cc lftp_ssl.h buffer_ssl.cc buffer_ssl.h
36 -proto_ftp_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
37 -proto_http_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
38 -proto_file_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
39 -proto_fish_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
40 -cmd_mirror_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
41 -cmd_sleep_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)
42 -libnetwork_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) $(SSL_LDFLAGS)
43 +proto_ftp_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
44 +proto_http_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
45 +proto_file_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
46 +proto_fish_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
47 +cmd_mirror_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
48 +cmd_sleep_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir)
49 +libnetwork_la_LDFLAGS = -avoid-version -rpath $(pkglibdir) $(SSL_LDFLAGS)
50 libnetwork_la_LIBADD = $(SOCKSLIBS) $(SSL_LIBS)
52 -proto_ftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) libnetwork.la
53 -proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) libnetwork.la
54 -proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) libnetwork.la
55 +proto_ftp_la_LIBADD = libnetwork.la
56 +proto_http_la_LIBADD = libnetwork.la
57 +proto_fish_la_LIBADD = libnetwork.la
59 libtasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\
60 ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\
62 ln -sf .libs/libtasks.a* libtasks.a
64 ln -sf .libs/libjobs.a* libjobs.a
66 -# libtool does not strip modules, do it here.
68 - @-if test "$(MODULES_LA)"; then \
69 - case " $(LDFLAGS) " in *" -s "*) \
70 - echo $(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so; \
71 - $(STRIP) $(DESTDIR)$(pkgverlibdir)/*.so;; \