modified configure file

configure.ac

@@ -133,12 +133,10 @@ AS_IF([test "x$ac_cv_lib_sqlite3_sqlite3_open" = "xyes"],
 AM_CONDITIONAL([HAVE_LIBSQLITE3],
                [test "x$ac_cv_lib_sqlite3_sqlite3_open" = "xyes"])
 dnl check for postgresql
-AC_CHECK_HEADERS([postgresql/libpq-fe.h],
-                  [AC_CHECK_LIB([pq] , [PQlibVersion], [HAVE_POSTGRESQL=1], [HAVE_POSTGRESQL=0])])
-
-AM_CONDITIONAL([USE_POSTGRESQL],
-               [test "$HAVE_POSTGRESQL" -eq 1])
-AS_IF([test "$USE_POSTGRESQL" -eq 1], [ax_libpq=yes], [ax_libpq=no])
+AC_CHECK_HEADERS([postgresql/libpq-fe.h],AC_CHECK_LIB([pq],[PQlibVersion]))
+AM_CONDITIONAL([HAVE_POSTGRESQL],[test "x$ac_cv_lib_pq_PQlibVersion" = "xyes"])
+AM_COND_IF([HAVE_POSTGRESQL],[ax_libpq=yes],[ax_libpq=no])
+AM_COND_IF([HAVE_POSTGRESQL], [AC_DEFINE([HAVE_LIBPQ_], [1], [Define if using libpq.])])
 
 # Check if we should link afflib.
 AC_ARG_WITH([afflib],

tsk/auto/db_postgresql.cpp

@@ -135,7 +135,7 @@ TSK_RETVAL_ENUM TskDbPostgreSQL::createDatabase(){
     TSK_RETVAL_ENUM result = TSK_OK;
 
     // Connect to PostgreSQL server first
-    char defaultPostgresDb[32] = TEXT("postgres");
+    char defaultPostgresDb[32] = "postgres";
     PGconn *serverConn = connectToDatabase(&defaultPostgresDb[0]);
     if (!serverConn)
         return TSK_ERR;
@@ -229,7 +229,7 @@ bool TskDbPostgreSQL::dbExists() {
     int numDb = 0;
 
     // Connect to PostgreSQL server first
-    char defaultPostgresDb[32] = TEXT("postgres");
+    char defaultPostgresDb[32] = "postgres";
     PGconn *serverConn = connectToDatabase(&defaultPostgresDb[0]);
     if (!serverConn)
         return false;

tsk/auto/tsk_db_postgresql.h

@@ -40,7 +40,7 @@ using std::map;
  */
 class TskDbPostgreSQL : public TskDb {
   public:
-    TskDbPostgreSQL(const cha * a_dbFilePath, bool a_blkMapFlag);
+    TskDbPostgreSQL(const char * a_dbFilePath, bool a_blkMapFlag);
     ~TskDbPostgreSQL();
     int open(bool);
     int close();

tsk/tsk_config.h.in

@@ -60,6 +60,12 @@
 /* Define to 1 if you have the <libewf.h> header file. */
 #undef HAVE_LIBEWF_H
 
+/* Define to 1 if you have the `pq' library (-lpq). */
+#undef HAVE_LIBPQ
+
+/* Define if using libpq. */
+#undef HAVE_LIBPQ_
+
 /* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
 #undef HAVE_LIBSQLITE3