diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2014-04-30 10:30:21 -0400 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2014-04-30 10:30:21 -0400 |
| commit | 38dac75dc1c92c127cc1727c5b3d6935275dfc83 (patch) | |
| tree | bb9e6dd662c9e78ffd98b64dbceda11b7f588957 /build_posix | |
| parent | 6196a5192621201523149b7ef0d9e5aa2fe53aec (diff) | |
| download | mongo-38dac75dc1c92c127cc1727c5b3d6935275dfc83.tar.gz | |
Move libtool configuration lines back above compiler configuration
to avoid spurious compilation warnings on MacOS.
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/configure.ac.in | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in index 1592a486ed3..238a5c6debc 100644 --- a/build_posix/configure.ac.in +++ b/build_posix/configure.ac.in @@ -12,15 +12,24 @@ AC_CONFIG_SRCDIR([RELEASE]) AM_INIT_AUTOMAKE([1.11 foreign parallel-tests subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])]) +# Configure options. The AM_OPTIONS and the libtool configuration +# need to stay here. Moving them below the compiler and other +# configurations causes -Wcast_align warnings and other warnings +# on MacOS. +AM_OPTIONS + +define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +LT_PREREQ(2.2.6) +LT_INIT([pic-only]) +AC_SUBST([LIBTOOL_DEPS]) + # If CFLAGS was not set on entry, default to "-O3 -g" : ${CFLAGS="-O3 -g"} AC_PROG_CC(cc gcc) # AC_PROG_CXX(c++ g++) -# Configure options. -AM_OPTIONS - if test "$GCC" = "yes"; then # The Solaris gcc compiler gets the additional -pthreads flag. if test "`uname -s`" = "SunOS"; then @@ -59,12 +68,6 @@ if test "$wt_cv_enable_python" = "yes"; then AC_SUBST(PYTHON_INSTALL_ARG) fi -define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl -define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl -LT_PREREQ(2.2.6) -LT_INIT([pic-only]) -AC_SUBST([LIBTOOL_DEPS]) - AM_TYPES AC_PROG_INSTALL |