Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed configure script to use pkg-config

Browse Source 
svn: r1156
This commit is contained in:
Don Allingham
2002-10-29 03:55:19 +00:00
parent a62c2a0822
commit e5997d0923
18 changed files with 97 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gramps2/src/AutoComp.py
View File

@@ -147,9 +147,8 @@ class AutoCombo(AutoCompBase):
self.inb = 0
text = self.entry.entry.get_text()
if self.nl == string.lower(text):
#self.entry.entry.set_position(self.l)
#self.entry.entry.select_region(self.l, -1)
pass
self.entry.entry.set_position(self.l)
self.entry.entry.select_region(self.l, -1)
def build_list(self,widget,event):
"""Internal task that builds the popdown strings. This task is called when the
@@ -204,8 +203,8 @@ class AutoCombo(AutoCompBase):
n = self.vals[0]
self.nl = string.lower(n)
entry.set_text(n)
#entry.set_position(self.l)
#entry.select_region(self.l, -1)
entry.set_position(self.l)
entry.select_region(self.l, -1)
else:
self.vals = [""]
@@ -258,7 +257,8 @@ class AutoEntry(AutoCompBase):
if nl[0:self.l] == typed_lc:
self.nl = nl
entry.set_text(n)
#entry.set_position(self.l)
#entry.select_region(self.l, -1)
print self.l
entry.set_position(self.l)
entry.select_region(self.l, -1)
return

7
gramps2/src/Makefile.am
View File

@@ -2,8 +2,9 @@
SUBDIRS = docgen filters plugins data po
# For intl. support, how do we compile?
CFLAGS = -fPIC -shared -O @CFLAGS@ @CPPFLAGS@ -I@includedir@
LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@
GVFSINC = @GPREF@
CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@
LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@
CLEANFILES = ${INTLLIBS}
MOSTLYCLEANFILES =
@@ -37,7 +38,7 @@ intl22.so: intl.c
grampslib.so: grampslib.i
swig -python grampslib.i
$(CC) $(CFLAGS) $(LDFLAGS) @P22_INCLUDES@ -o $@ grampslib_wrap.c -lgnomevfs-2
$(CC) $(CFLAGS) @P22_INCLUDES@ -o $@ grampslib_wrap.c $(LDFLAGS)
# In principle the following rule slightly violates the automake/autoconf
# spirit of keeping each subdirectory as a separate entity unto itself.

12
gramps2/src/Makefile.in
View File

@@ -70,8 +70,11 @@ CC = @CC@
DEPDIR = @DEPDIR@
DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
GNOMEHELP = @GNOMEHELP@
HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
GNOMEINC = @GNOMEINC@
GNOMELIB = @GNOMELIB@
GPREF = @GPREF@
HAVE_JW = @HAVE_JW@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
JW = @JW@
@@ -110,8 +113,9 @@ pythondir = @pythondir@
SUBDIRS = docgen filters plugins data po
# For intl. support, how do we compile?
CFLAGS = -fPIC -shared -O @CFLAGS@ @CPPFLAGS@ -I@includedir@
LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@
GVFSINC = @GPREF@
CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@
LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@
CLEANFILES = ${INTLLIBS}
MOSTLYCLEANFILES =
@@ -453,7 +457,7 @@ intl22.so: intl.c
grampslib.so: grampslib.i
swig -python grampslib.i
$(CC) $(CFLAGS) $(LDFLAGS) @P22_INCLUDES@ -o $@ grampslib_wrap.c -lgnomevfs-2
$(CC) $(CFLAGS) @P22_INCLUDES@ -o $@ grampslib_wrap.c $(LDFLAGS)
# In principle the following rule slightly violates the automake/autoconf
# spirit of keeping each subdirectory as a separate entity unto itself.

5
gramps2/src/data/Makefile.in
View File

@@ -70,8 +70,11 @@ CC = @CC@
DEPDIR = @DEPDIR@
DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
GNOMEHELP = @GNOMEHELP@
HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
GNOMEINC = @GNOMEINC@
GNOMELIB = @GNOMELIB@
GPREF = @GPREF@
HAVE_JW = @HAVE_JW@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
JW = @JW@

5
gramps2/src/data/templates/Makefile.in
View File

@@ -71,8 +71,11 @@ CC = @CC@
DEPDIR = @DEPDIR@
DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
GNOMEHELP = @GNOMEHELP@
HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
GNOMEINC = @GNOMEINC@
GNOMELIB = @GNOMELIB@
GPREF = @GPREF@
HAVE_JW = @HAVE_JW@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
JW = @JW@

5
gramps2/src/docgen/Makefile.in
View File

@@ -70,8 +70,11 @@ CC = @CC@
DEPDIR = @DEPDIR@
DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
GNOMEHELP = @GNOMEHELP@
HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
GNOMEINC = @GNOMEINC@
GNOMELIB = @GNOMELIB@
GPREF = @GPREF@
HAVE_JW = @HAVE_JW@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
JW = @JW@

5
gramps2/src/filters/Makefile.in
View File

@@ -70,8 +70,11 @@ CC = @CC@
DEPDIR = @DEPDIR@
DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
GNOMEHELP = @GNOMEHELP@
HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
GNOMEINC = @GNOMEINC@
GNOMELIB = @GNOMELIB@
GPREF = @GPREF@
HAVE_JW = @HAVE_JW@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
JW = @JW@

5
gramps2/src/plugins/Makefile.in
View File

@@ -71,8 +71,11 @@ CC = @CC@
DEPDIR = @DEPDIR@
DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
GNOMEHELP = @GNOMEHELP@
HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
GNOMEINC = @GNOMEINC@
GNOMELIB = @GNOMELIB@
GPREF = @GPREF@
HAVE_JW = @HAVE_JW@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
JW = @JW@

5
gramps2/src/po/Makefile.in
View File

@@ -70,8 +70,11 @@ CC = @CC@
DEPDIR = @DEPDIR@
DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@
GNOMEHELP = @GNOMEHELP@
HAVE_GNOME_CONFIG = @HAVE_GNOME_CONFIG@
GNOMEINC = @GNOMEINC@
GNOMELIB = @GNOMELIB@
GPREF = @GPREF@
HAVE_JW = @HAVE_JW@
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
JW = @JW@