[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src(PHP_5_1) /ext/sqlite config.m4
From:       "Wez Furlong" <wez () php ! net>
Date:       2005-11-30 4:50:04
Message-ID: cvswez1133326204 () cvsserver
[Download RAW message or body]

wez		Tue Nov 29 23:50:04 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/sqlite	config.m4 
  Log:
  Fix dep usage; it must appear after the PHP_NEW_EXTENSION line.
  pdo and spl are both optional dependencies.
  
  
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.41&r2=1.41.2.1&ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.41 php-src/ext/sqlite/config.m4:1.41.2.1
--- php-src/ext/sqlite/config.m4:1.41	Mon Jun 13 21:44:16 2005
+++ php-src/ext/sqlite/config.m4	Tue Nov 29 23:50:03 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.41 2005/06/14 01:44:16 sniper Exp $
+dnl $Id: config.m4,v 1.41.2.1 2005/11/30 04:50:03 wez Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -105,16 +105,15 @@
         libsqlite/src/vacuum.c libsqlite/src/copy.c \
         libsqlite/src/vdbeaux.c libsqlite/src/date.c \
         libsqlite/src/where.c libsqlite/src/trigger.c"
- 
-    PHP_ADD_EXTENSION_DEP(sqlite, spl)
-    PHP_ADD_EXTENSION_DEP(sqlite, pdo)
   fi
-
   dnl
   dnl Common for both bundled/external
   dnl
   sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" 
   PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
+  PHP_ADD_EXTENSION_DEP(sqlite, spl, true)
+  PHP_ADD_EXTENSION_DEP(sqlite, pdo, true)
+
   PHP_ADD_MAKEFILE_FRAGMENT
   PHP_SUBST(SQLITE_SHARED_LIBADD)
   PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]