Update pkg-config stuff.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1099 0109f412-320b-0410-ab79-c3e0c5ffbbe6

sql/Makefile.am

@@ -2,17 +2,19 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = GNUMakefile README.W32 win32
 
-SUBDIRS = $(subdirs) src obs
+SUBDIRS = src obs
 
 doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libflaimsql.pc
 
+RPM = rpm
+
 rpms srcrpm: dist
-	$(MAKE) -C obs $(AM_MAKEFLAGS) $@
-	rpmarch=`rpm --showrc | grep ^build\ arch | sed 's/\(.*: \)\(.*\)/\2/'`; \
-	test -z $$rpmarch || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
+	cd obj && $(MAKE) $(AM_MAKEFLAGS) $@
+	rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
+	test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
 	rm -rf $(distdir)
 
 dist-hook:

sql/configure.ac

@@ -32,9 +32,12 @@ AC_ARG_ENABLE([debug],
 # Create Automake conditional based on the DOXYGEN variable
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "x$DOXYGEN" != x])
 
+# Configure for large files, even on 32-bit systems
+AC_SYS_LARGEFILE
+
 # Check for pthreads
 ACX_PTHREAD(
- [AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])
+ [AC_DEFINE([HAVE_PTHREAD], [1], [Define if you have POSIX threads libraries and header files.])
   LIBS="$PTHREAD_LIBS $LIBS"
   CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
   CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
@@ -51,13 +54,9 @@ AC_C_INLINE
 
 # Checks for library functions.
 
-# Configure for large files, even on 32-bit systems
-AC_SYS_LARGEFILE
-
 # Configure DEBUG source code, if requested.
-if test "x$debug" = xyes; then
-  AC_DEFINE([FLM_DEBUG], [], [Define to enable FLAIM debug features])
-fi
+AS_IF([test "x$debug" = xyes],
+  [AC_DEFINE([FLM_DEBUG], [1], [Define to enable FLAIM debug features])])
 
 # Configure compiler and platform flags and options.
 # This stuff was in the original makefile...
@@ -95,8 +94,7 @@ case $host in
     fi ;;
 
   *-apple-darwin*)
-    AC_DEFINE([OSX], [], 
-      [Define if building on Apple OSX.]) ;;
+    AC_DEFINE([OSX], [1], [Define if building on Apple OSX.]) ;;
 
   *-*-aix*)
     if "x$CXX" != "xg++"; then

sql/libflaimsql.pc.in

@@ -1,10 +1,10 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libflaimsql
+Name: FLAIMSQL
+URL: http://forge.novell.com/modules/xfmod/project/?flaim
 Description: Embeddable cross-platform SQL database engine
-Version: @VERSION@
-Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -lflaimsql -L${libdir}
+Version: @PACKAGE_VERSION@
+Requires: libflaimtk >= 1.0
+Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -L${libdir} -lflaimsql
 Cflags: -I${includedir}