diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:46:31 +0200 |
| commit | a5303710f05e76f3cb3bf9d5d0c4985ad6603095 (patch) | |
| tree | a297dc94d798ac004a4ad65c4d57c7c6af5e7dbe /berkeleydb | |
| parent | 8e872440fdf116e903baf92c80b88154566688c8 (diff) | |
| parent | e0785dd388faf57cd20bf3bb13a28ffc410911ef (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
berkeleydb/makefile.mk
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index fc7b379a070d..8345124de5de 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -94,7 +94,7 @@ CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION= \ ..$/dist$/configure -CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-compat185 +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-compat185 CC='$(CC) $(SOLARLIB)' .IF "$(OS)"=="IOS" CONFIGURE_FLAGS+= --disable-shared .ELSE |