Update of /cvsroot/eas-dev/eas/client
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30411/client
Modified Files:
Makefile main.prg
Log Message:
Fix configure for check clip-ui drivers and PAM. By default gtk2 driver is used.
Index: Makefile
===================================================================
RCS file: /cvsroot/eas-dev/eas/client/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 3 Nov 2006 16:12:06 -0000 1.5
+++ Makefile 20 Nov 2006 12:57:55 -0000 1.6
@@ -9,7 +9,7 @@
CLIP = $(CLIPROOT)/bin/clip
CLIPLIBS = -L$(CLIPROOT)/lib -lclip-codb -lcodb-query -lclip-ui -lclip-xml -lexpat
EASLIBS = -leas
-CLIPFLAGS = -a -O -b
+CLIPFLAGS = -aObw $(BUILDFLAGS)
ICONS = eas-logo.xpm eas.xpm
.SUFFIXES: .prg .o .po
@@ -27,7 +27,7 @@
$(PRG): $(OBJS)
# export LIBRARY_PATH=
- $(CLIP) $(CLIPFLAGS) -eslM $(CLIPINCLUDE) -o $(PRG) $(OBJS) $(CLIPLIBS) $(EASLIBS)
+ $(CLIP) $(CLIPFLAGS) -esl $(CLIPINCLUDE) -o $(PRG) $(OBJS) $(CLIPLIBS) $(EASLIBS)
install: all $(PRG)
@../mkinstalldirs $(DESTDIR)$(EASBINDIR)
@@ -40,4 +40,4 @@
rm -rf $(DESTDIR)$(EASDATADIR)/client/ >/dev/null 2>&1 || :
.prg.o:
- $(CLIP) $(CLIPFLAGS) -DEAS_MODULES=\"$(EASDATADIR)/client/\" $(CLIPINCLUDE) $<
+ $(CLIP) -n $(CLIPFLAGS) -DEAS_MODULES=\"$(EASDATADIR)/client/\" $(CLIPINCLUDE) $<
Index: main.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/client/main.prg,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- main.prg 15 Nov 2006 10:37:18 -0000 1.11
+++ main.prg 20 Nov 2006 12:57:55 -0000 1.12
@@ -29,7 +29,7 @@
/* Main function */
function main()
- local lang, params:=array(0), i, dir, defConfigFile
+ local lang, params:=array(0), i, dir, defConfigFile, oErr
oErr := errorBlock({|e| break(e) })
@@ -349,6 +349,8 @@
/* About dialog */
function dialogAbout()
local win, t, cap, bb, bD
+ local gTitle, wIcon, wVer, driver
+
// Create window
win := UIWindow(i18n("About"), NIL, "aboutWindow", .F. )
win:setIcon(UIImage( EAS_MODULES+PATH_DELIM+"icons"+PATH_DELIM+"eas.xpm"))
|
