From c04d7308e2eb398c460f4fcea33766445473b473 Mon Sep 17 00:00:00 2001
From: Anton Batenev <antonbatenev@yandex.ru>
Date: Thu, 23 May 2013 21:30:14 +0400
Subject: [PATCH] Refactoring (and fix #1)

---
 build.sh  | 42 +++++++++++++++++++-----------------------
 config.m4 |  2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/build.sh b/build.sh
index 23c3ff3..6e72964 100755
--- a/build.sh
+++ b/build.sh
@@ -118,29 +118,33 @@ fi
 PDO_SQLITE="${PHP_SRC}/ext/pdo_sqlite"
 
 cp "${PDO_SQLITE}/"*.c "${PDO_SQLITE}"/*.h "${BUILD_DIR}/"
+if [ $? -ne 0 ]; then
+	exit $?
+fi
+
+cp "${SQLCIPHER_SRC}/sqlite3.c" "${BUILD_DIR}/sqlite3.c"
+if [ $? -ne 0 ]; then
+	exit $?
+fi
+
+cp "${SQLCIPHER_SRC}/sqlite3.h" "${BUILD_DIR}/sqlite3.h"
+if [ $? -ne 0 ]; then
+	exit $?
+fi
 
 # magic :)
 for FILE in "${BUILD_DIR}"/*
 do
 	cat "${FILE}" | \
-		sed -e 's/<sqlite3.h>/"sqlite3.h"/g'                            | \
-		sed -e 's/pdo_sqlite/pdo_sqlcipher/g'                           | \
-		sed -e 's/php_sqlite3/php_sqlcipher/g'                          | \
-		sed -e 's/sqlite_handle_/sqlcipher_handle_/g'                   | \
-		sed -e 's/sqlite_stmt_methods/sqlcipher_stmt_methods/g'         | \
-		sed -e 's/sqlite_methods/sqlcipher_methods/g'                   | \
-		sed -e 's/SQLite/SQLCipher/g'                                   | \
-		sed -e 's/sqliteCreate/sqlcipherCreate/g'                       | \
-		sed -e 's/PDO_SQLITE/PDO_SQLCIPHER/g'                           | \
-		sed -e 's/HEADER(sqlite)/HEADER(sqlcipher)/g'                   | \
-		sed -e 's/PDO Driver for SQLite 3.x/PDO Driver for SQLCipher/g' | \
-		sed -e 's/SQLite Library/SQLCipher Library/g'                   > \
+		sed -e 's/sqlite/sqlcipher/g' | \
+		sed -e 's/SQLite/SQLCipher/g' | \
+		sed -e 's/SQLITE/SQLCIPHER/g' > \
 		"${FILE}.tmp"
 	if [ $? -ne 0 ]; then
 		exit $?
 	fi
 
-	NEW_FILE=$(echo ${FILE} | sed 's/pdo_sqlite/pdo_sqlcipher/')
+	NEW_FILE=$(echo ${FILE} | sed 's/sqlite/sqlcipher/')
 
 	mv "${FILE}.tmp" "${NEW_FILE}"
 	if [ $? -ne 0 ]; then
@@ -159,16 +163,6 @@ done
 # Build pdo_sqlcipher
 #
 
-cp "${SQLCIPHER_SRC}/sqlite3.c" "${BUILD_DIR}/sqlite3.c"
-if [ $? -ne 0 ]; then
-	exit $?
-fi
-
-cp "${SQLCIPHER_SRC}/sqlite3.h" "${BUILD_DIR}/sqlite3.h"
-if [ $? -ne 0 ]; then
-	exit $?
-fi
-
 cp "config.m4" "${BUILD_DIR}/config.m4"
 if [ $? -ne 0 ]; then
 	exit $?
@@ -186,6 +180,8 @@ if [ $? -ne 0 ]; then
 	exit $?
 fi
 
+CFLAGS=$(echo "${CFLAGS}" | sed -e 's/SQLITE/SQLCIPHER/g')
+
 ./configure \
 	CFLAGS="${CFLAGS}" \
 	LDFLAGS="${LDFLAGS}"
diff --git a/config.m4 b/config.m4
index 55c541e..74af51d 100644
--- a/config.m4
+++ b/config.m4
@@ -25,7 +25,7 @@ if test "$PHP_PDO_SQLCIPHER" != "no"; then
     fi
     AC_MSG_RESULT($pdo_inc_path)
 
-    php_pdo_sqlcipher_sources_core="pdo_sqlcipher.c sqlite_driver.c sqlite_statement.c sqlite3.c"
+    php_pdo_sqlcipher_sources_core="pdo_sqlcipher.c sqlcipher_driver.c sqlcipher_statement.c sqlcipher3.c"
 
     PHP_NEW_EXTENSION(pdo_sqlcipher, $php_pdo_sqlcipher_sources_core, $ext_shared,,-I$pdo_inc_path)