Author: jmagne
Update of /cvs/dirsec/esc/src/app/daemon
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9469
Modified Files:
escd.cpp manifest.mn
Log Message:
Latest fixes.
Index: escd.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/daemon/escd.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- escd.cpp 27 Sep 2006 17:10:02 -0000 1.1
+++ escd.cpp 25 Oct 2006 03:56:57 -0000 1.2
@@ -67,9 +67,6 @@
PR_DestroyLock(mDataLock);
- if(single)
- delete single;
-
exit(0);
}
Index: manifest.mn
===================================================================
RCS file: /cvs/dirsec/esc/src/app/daemon/manifest.mn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manifest.mn 27 Sep 2006 17:10:02 -0000 1.1
+++ manifest.mn 25 Oct 2006 03:56:57 -0000 1.2
@@ -20,15 +20,23 @@
CORE_DIST= $(CORE_DEPTH)/dist/
SYS_INC= /usr/include
+
+XULRUNNER_LIBS_LDFLAGS=
ifndef MOZ_OFFSET
MOZ_OFFSET = mozilla-1.7.13
+else
+XULRUNNER_LIBS_LDFLAGS=$(CORE_DIST)/$(OBJDIR)/xulrunner_build/dist/lib
endif
+
+
DEFINES += -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr
-I$(SYS_INC)/$(MOZ_OFFSET)/nss
+DEFINES += $(shell pkg-config --cflags xft)
+
CPPFLAGS += $(DEFINES) -g
-LDFLAGS += -lstdc++ -L$(CORE_DIST)/$(OBJDIR)/lib -lnss3 -lnspr4 -lssl3 -lckyapplet
-lX11
+LDFLAGS += -lstdc++ -L$(CORE_DIST)/$(OBJDIR)/lib -L$(XULRUNNER_LIBS_LDFLAGS) -lnss3
-lnspr4 -lssl3 -lckyapplet $(shell pkg-config --libs xft)
LDFLAGS += -lckymanager -lhttpchunked
# MODULE public and private header directories are implicitly REQUIRED.
Show replies by date