Commit 2ba90833 authored by Howard Chu's avatar Howard Chu
Browse files

Misc Windows linking fixes

parent c7fe31b0
...@@ -168,7 +168,7 @@ slapd.def: libbackends.a liboverlays.a version.o ...@@ -168,7 +168,7 @@ slapd.def: libbackends.a liboverlays.a version.o
done="" ;\ done="" ;\
base=`expr "$$i" : "-l\(.*\)"`; \ base=`expr "$$i" : "-l\(.*\)"`; \
for p in $$paths ; do \ for p in $$paths ; do \
for ext in la dll a ; do \ for ext in la dll dll.a a ; do \
path=$$p/lib$$base.$$ext; \ path=$$p/lib$$base.$$ext; \
test ! -f $$path && continue; \ test ! -f $$path && continue; \
if test $$ext = la ; then \ if test $$ext = la ; then \
...@@ -192,12 +192,14 @@ slapd.def: libbackends.a liboverlays.a version.o ...@@ -192,12 +192,14 @@ slapd.def: libbackends.a liboverlays.a version.o
test -z "$$obj" && continue; \ test -z "$$obj" && continue; \
;; \ ;; \
*.la) \ *.la) \
if test -n "$LTSTATIC"; then \ if test -n "$(LTSTATIC)"; then \
base=`expr "$$i" : ".*/\(.*\).la"`; \ base=`expr "$$i" : ".*/\(.*\).la"`; \
path=`expr "$$i" : "\(.*/\).*"`; \ path=`expr "$$i" : "\(.*/\).*"`; \
obj=$$path.libs/$$base.a; \ obj=$$path.libs/$$base.a; \
fi; \ fi; \
;; \ ;; \
*.dll.a) \
;; \
*.o | *.a) \ *.o | *.a) \
obj=$$i; \ obj=$$i; \
esac; \ esac; \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment