Fixed configure script to use pkg-config

svn: r1156

Makefile.in

@@ -72,8 +72,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@

configure

@@ -3559,15 +3559,15 @@ fi
 
 
 
-# Extract the first word of "gnome-config", so it can be a program name with args.
+# Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy gnome-config; ac_word=$2
+set dummy pkg-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_HAVE_GNOME_CONFIG+set}" = set; then
+if test "${ac_cv_prog_HAVE_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -n "$HAVE_GNOME_CONFIG"; then
+  if test -n "$HAVE_PKG_CONFIG"; then
-  ac_cv_prog_HAVE_GNOME_CONFIG="$HAVE_GNOME_CONFIG" # Let the user override the test.
+  ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -3576,26 +3576,27 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_HAVE_GNOME_CONFIG=""YES""
+    ac_cv_prog_HAVE_PKG_CONFIG=""YES""
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 
-  test -z "$ac_cv_prog_HAVE_GNOME_CONFIG" && ac_cv_prog_HAVE_GNOME_CONFIG=""NO""
+  test -z "$ac_cv_prog_HAVE_PKG_CONFIG" && ac_cv_prog_HAVE_PKG_CONFIG=""NO""
 fi
 fi
-HAVE_GNOME_CONFIG=$ac_cv_prog_HAVE_GNOME_CONFIG
+HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
-if test -n "$HAVE_GNOME_CONFIG"; then
+if test -n "$HAVE_PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $HAVE_GNOME_CONFIG" >&5
+  echo "$as_me:$LINENO: result: $HAVE_PKG_CONFIG" >&5
-echo "${ECHO_T}$HAVE_GNOME_CONFIG" >&6
+echo "${ECHO_T}$HAVE_PKG_CONFIG" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-GNOMEHELP=`gnome-config --prefix`
+GNOMEINC=`pkg-config --cflags gnome-vfs-module-2.0`
+GNOMELIB=`pkg-config --libs gnome-vfs-module-2.0`
 
 
 echo "$as_me:$LINENO: checking Python bindings for sax/xml" >&5
@@ -3891,6 +3892,9 @@ fi
 
 
 
+
+
+
 ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile doc/extending-gramps/Makefile doc/extending-gramps/C/Makefile omf-install/Makefile gramps.spec gramps.sh"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4555,7 +4559,7 @@ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@CPP@,$CPP,;t t
-s,@HAVE_GNOME_CONFIG@,$HAVE_GNOME_CONFIG,;t t
+s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t
 s,@SCROLLKEEPER_REQUIRED@,$SCROLLKEEPER_REQUIRED,;t t
 s,@SCROLLKEEPER_CONFIG@,$SCROLLKEEPER_CONFIG,;t t
 s,@DISABLE_SCROLLKEEPER@,$DISABLE_SCROLLKEEPER,;t t
@@ -4566,6 +4570,9 @@ s,@P15_INCLUDES@,$P15_INCLUDES,;t t
 s,@P20_INCLUDES@,$P20_INCLUDES,;t t
 s,@P21_INCLUDES@,$P21_INCLUDES,;t t
 s,@P22_INCLUDES@,$P22_INCLUDES,;t t
+s,@GNOMEINC@,$GNOMEINC,;t t
+s,@GNOMELIB@,$GNOMELIB,;t t
+s,@GPREF@,$GPREF,;t t
 s,@INTLLIBS@,$INTLLIBS,;t t
 CEOF
 

configure.in

@@ -71,8 +71,9 @@ AC_CHECK_LIB(c,textdomain,LIBS="",
 
 dnl Check for programs
 
-AC_CHECK_PROG(HAVE_GNOME_CONFIG, gnome-config, "YES", "NO")
+AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, "YES", "NO")
-GNOMEHELP=`gnome-config --prefix`
+GNOMEINC=`pkg-config --cflags gnome-vfs-module-2.0`
+GNOMELIB=`pkg-config --libs gnome-vfs-module-2.0`
 
 dnl Check if python bindings for gtk are installed
 
@@ -271,6 +272,9 @@ AC_SUBST(P15_INCLUDES)
 AC_SUBST(P20_INCLUDES)
 AC_SUBST(P21_INCLUDES)
 AC_SUBST(P22_INCLUDES)
+AC_SUBST(GNOMEINC)
+AC_SUBST(GNOMELIB)
+AC_SUBST(GPREF)
 AC_SUBST(INTLLIBS)
 
 AC_OUTPUT([

doc/Makefile.in

@@ -72,8 +72,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@

doc/extending-gramps/C/Makefile.in

@@ -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@

doc/extending-gramps/Makefile.in

@@ -72,8 +72,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@

doc/gramps-manual/C/Makefile.in

@@ -104,8 +104,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@

doc/gramps-manual/Makefile.in

@@ -72,8 +72,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@

omf-install/Makefile.in

@@ -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@

src/AutoComp.py

@@ -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.set_position(self.l)
-            #self.entry.entry.select_region(self.l, -1)
+            self.entry.entry.select_region(self.l, -1)
-            pass
             
     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.set_position(self.l)
-            #entry.select_region(self.l, -1)
+            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)
+                print self.l
-                #entry.select_region(self.l, -1)
+                entry.set_position(self.l)
+                entry.select_region(self.l, -1)
                 return
 

src/Makefile.am

@@ -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@
+GVFSINC = @GPREF@
-LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@
+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. 

src/Makefile.in

@@ -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@
+GVFSINC = @GPREF@
-LDFLAGS = @LDFLAGS@ -L@libdir@ @LIBS@
+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. 

src/data/Makefile.in

@@ -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@

src/data/templates/Makefile.in

@@ -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@

src/docgen/Makefile.in

@@ -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@

src/filters/Makefile.in

@@ -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@

src/plugins/Makefile.in

@@ -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@

src/po/Makefile.in

@@ -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@