com php-src: Minor touches to the exif build script on Windows; ADD_EXTENSION_DEP() will already ERROR() ou t, so the WARNING() statement would never
b e returned anyway.: ext/exif/config.w32
| From: | Kalle Sommer Nielsen | Date: | Wed, 03 Aug 2016 02:24:17 +0000 |
| Subject: | com php-src: Minor touches to the exif build script on Windows; ADD_EXTENSION_DEP() will already ERROR() ou t, so the WARNING() statement would never b e returned anyway.: ext/exif/config.w32 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93542@lists.php.net to get a copy of this message | ||
Commit: 3e921aa9dfa2813b5445caacf2bdbdbf8fdd6b2e
Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 3 Aug 2016 04:24:17 +0200
Parents: 6a748c2f4b44829119d2bc7845b3767ff80cafda
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e921aa9dfa2813b5445caacf2bdbdbf8fdd6b2e
Log:
Minor touches to the exif build script on Windows; ADD_EXTENSION_DEP() will already ERROR() out, so
the WARNING() statement would never be returned anyway.
There are probably other similar cases around ext/, however the main reason for fixing this was for
the typo (libxml > mbstring).
Changed paths:
M ext/exif/config.w32
Diff:
diff --git a/ext/exif/config.w32 b/ext/exif/config.w32
index 595e71b..ad000c4 100644
--- a/ext/exif/config.w32
+++ b/ext/exif/config.w32
@@ -1,14 +1,14 @@
// $Id$
// vim:ft=javascript
-ARG_ENABLE("exif", "exif", "no");
+ARG_ENABLE('exif', 'Exchangeable image information (EXIF) Support',
'no');
-if (PHP_EXIF == "yes") {
- if (ADD_EXTENSION_DEP('exif', 'mbstring')) {
- EXTENSION("exif", "exif.c", null,
"/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
- AC_DEFINE('HAVE_EXIF', 1, 'Have exif');
- } else {
- WARNING("exif support can't be enabled, libxml is not enabled")
- PHP_EXIF = "no"
+if(PHP_EXIF != 'no')
+{
+ if(ADD_EXTENSION_DEP('exif', 'mbstring'))
+ {
+ AC_DEFINE('HAVE_EXIF', 1, 'Have EXIF Support');
+
+ EXTENSION('exif', 'exif.c', null,
'/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
}
-}
+}
\ No newline at end of file