diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-27 18:41:29 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-27 18:41:29 -0600 |
| commit | 95834a51f4b960f24d3c9366bbfd8aee6c73da4e (patch) | |
| tree | 4ea0d53b571ea92d6f4e8f541494cb56da25f9bf /configure.in | |
| parent | 235e75209d1f0f552bfc60d74502124217f8d310 (diff) | |
| parent | 61e988e712ed82542ebc1d867a21e71f3103a0f7 (diff) | |
| download | mariadb-git-95834a51f4b960f24d3c9366bbfd8aee6c73da4e.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
configure.in:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/partition_pruning.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
Auto merged
mysql-test/suite/rpl/t/rpl_relayspace.test:
Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
Auto merged
mysql-test/t/select.test:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/time.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
manual merge (use remote)
mysql-test/suite/rpl/t/disabled.def:
Manual merge - both rpl_innodb_mixed_ddl and rpl_innodb_mixed_dml
are fixed, and should be run as part of the rpl suite.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 8a85ef72ac8..772417cd9da 100644 --- a/configure.in +++ b/configure.in @@ -2623,6 +2623,14 @@ AC_SUBST(CC) AC_SUBST(GXX) # Set configuration options for make_binary_distribution +case $SYSTEM_TYPE in + *netware*) + MAKE_BINARY_DISTRIBUTION_OPTIONS="$MAKE_BINARY_DISTRIBUTION_OPTIONS --no-strip" + ;; + *) + : # no change for other platforms yet + ;; +esac AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) # Output results |