From: pweilbacher <pweilbacher@noemail.net>
Date: Fri, 22 Aug 2008 13:58:55 +0000 (+0000)
Subject: remove OS/2 compiler flags that aren't really necessary (CVS 5594)
X-Git-Tag: version-3.6.10~583
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dac8e249afc3de4cfd970dd15bcfd2e63437da2e;p=thirdparty%2Fsqlite.git

remove OS/2 compiler flags that aren't really necessary (CVS 5594)

FossilOrigin-Name: b688c68c3d70dc69adc2d1a08ddcf5899a115646
---

diff --git a/configure.ac b/configure.ac
index 3af75679c3..5f442a0ba6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n']))
 dnl Put the RCS revision string after AC_INIT so that it will also
 dnl show in in configure.
 # The following RCS revision string applies to configure.in
-# $Revision: 1.48 $
+# $Revision: 1.49 $
 
 #########
 # Programs needed
@@ -344,10 +344,6 @@ if test "$TARGET_EXEEXT" = ".exe"; then
     SQLITE_OS_WIN=0
     SQLITE_OS_OS2=1
     CFLAGS="$CFLAGS -DSQLITE_OS_OS2=1"
-    if test "$ac_compiler_gnu" = "yes" ; then
-      CFLAGS="$CFLAGS -Zomf -Zexe -Zmap"
-      BUILD_CFLAGS="$BUILD_CFLAGS -Zomf -Zexe"
-    fi
   else
     SQLITE_OS_UNIX=0
     SQLITE_OS_WIN=1
diff --git a/manifest b/manifest
index ce5dc02fc6..d575fb678d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C fix\ssome\stests\sto\stake\sthe\sright\sbranch\son\sOS/2\s(hope\sI\sgot\sthe\sTcl\ssyntax\sright)\s(CVS\s5593)
-D 2008-08-22T13:57:39
+C remove\sOS/2\scompiler\sflags\sthat\saren't\sreally\snecessary\s(CVS\s5594)
+D 2008-08-22T13:58:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 51b727303f84cf055e29514d8248e5eaf9701379
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -18,7 +18,7 @@ F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 3fda160d9a0ebbd6c22c0391354fa0036474680f
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
 F configure a013a40a9215b92fb9267603823f95d007ab5b00 x
-F configure.ac 3ce485247a4facc8df9cf03038c2014ed9d0ccda
+F configure.ac 24d54c19c2fb8045598495250230d117c2464502
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8aaa77000fb86fe512405a0ad40cb08678a12198
-R 90c51ef90aca648a6dca010f02b9d08a
+P 10e62d4700c99faf07140a8204d3cd81481206ac
+R 684694bd79bd41d3ec0440c436400237
 U pweilbacher
-Z 1a9bc88c2eda9eebe512d73221dd8dba
+Z 5683d4a6bb0feb55e16e8cf19c7c6973
diff --git a/manifest.uuid b/manifest.uuid
index 31676e239d..dae28a1e45 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-10e62d4700c99faf07140a8204d3cd81481206ac
\ No newline at end of file
+b688c68c3d70dc69adc2d1a08ddcf5899a115646
\ No newline at end of file