Changeset 26194

Timestamp:

Nov 19, 2009, 11:19:58 AM (16 years ago)

Author:

bills

Message:

change pxadmin to use the IPPDB_VERSION instead of the ippTools version
to set the database version. Require ippdb version 1.1.57 to build

Location:

trunk

Files:

• dbconfig/changes.1.1.56 (deleted)
• dbconfig/config.md (modified) (1 diff)
• ippTools/configure.ac (modified) (3 diffs)
• ippTools/src/pxadmin.c (modified) (2 diffs)

trunk/dbconfig/config.md

@@ -2 +2 @@
     pkg_name        STR     ippdb
     pkg_namespace   STR     ippdb
-    pkg_version     STR     1.1.56
+    pkg_version     STR     1.1.57
 END

trunk/ippTools/configure.ac

@@ -1 +1 @@
 AC_PREREQ(2.61)
 
-AC_INIT([ipptools], [1.1.56], [ipp-support@ifa.hawaii.edu])
+AC_INIT([ipptools], [1.1.57], [ipp-support@ifa.hawaii.edu])
 AC_CONFIG_SRCDIR([autogen.sh])
 
@@ -18 +18 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.56]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.57]) 
 
 PXTOOLS_CFLAGS="${PSLIB_CFLAGS=} ${PSMODULES_CFLAGS=} ${IPPDB_CFLAGS=}"
@@ -59 +59 @@
 
 IPPDB_VERSION=`$PKG_CONFIG --modversion ippdb`
-AC_DEFINE_UNQUOTED(IPPDB_VERSION, $IPPDB_VERSION, [Version of ippdb])
+AC_DEFINE_UNQUOTED(IPPDB_VERSION, ["$IPPDB_VERSION"], [Version of ippdb])
 
 AC_CONFIG_FILES([

trunk/ippTools/src/pxadmin.c

@@ -114 +114 @@
     psFree(query);
 
-    if (!insert_dbversion(config, PACKAGE_VERSION)) {
+    if (!insert_dbversion(config, IPPDB_VERSION)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set database version");
         return false;
@@ -155 +155 @@
     psFree(query);
 
-    if (!insert_dbversion(config, PACKAGE_VERSION)) {
+    if (!insert_dbversion(config, IPPDB_VERSION)) {
         psError(PS_ERR_UNKNOWN, false, "failed to set database version");
         return false;