← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/clamav/jaunty-backports

« back to all changes in this revision

Viewing changes to libclamav/c++/configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-10-02 15:36:00 UTC
  • mfrom: (10.1.6 sid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20101002153600-2tx3vki1u55cdrjy
Tags: 0.96.3+dfsg-2ubuntu0.10.04.1
https://launchpad.net/bugs/653738
Microversion update to 0.96.3 for Lucid (LP: #653738)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/c++/configure.ac
54
54
AC_ARG_ENABLE(optimized, AC_HELP_STRING([-enable-optimized],
55
55
              [Compile with optimizations enabled (default is YES)]),
56
56
              enable_optimized=$enableval, enable_optimized=default)
57
 
AM_CONDITIONAL(DEBUG_BUILD,[test "x$enable_optimized" == "xno"])
 
57
AM_CONDITIONAL(DEBUG_BUILD,[test "x$enable_optimized" = "xno"])
58
58
 
59
59
dnl Set configure args for subdir
60
60
if test "$enable_optimized" = "default"; then
115
115
    esac
116
116
fi
117
117
 
 
118
dnl bb #1971 - doesn't work with older libstdc++ version at link/runtime
 
119
AC_MSG_CHECKING([for working libstdc++])
 
120
AC_LANG_PUSH([C++])
 
121
AC_RUN_IFELSE(
 
122
    AC_LANG_SOURCE([[
 
123
        #include <iostream>
 
124
        int main()
 
125
        {
 
126
            // this causes an @GLIBCXX_3.4.9 symbol to be linked in -O2 mode
 
127
            std::cout << "test";
 
128
            return 0;
 
129
    }
 
130
    ]]),[AC_MSG_RESULT([yes])],
 
131
    [AC_MSG_FAILURE([failed])],
 
132
[AC_LINK_IFELSE(
 
133
    AC_LANG_SOURCE([[
 
134
        #include <iostream>
 
135
        int main()
 
136
        {
 
137
            // this causes an @GLIBCXX_3.4.9 symbol to be linked in -O2 mode
 
138
            std::cout << "test";
 
139
            return 0;
 
140
        }
 
141
    ]]), [AC_MSG_RESULT([yes])],
 
142
    [AC_MSG_FAILURE([failed])]
 
143
)])
 
144
AC_LANG_POP([C++])
 
145
 
118
146
build_x86=no
119
147
build_ppc=no
120
148
build_arm=no
139
167
freebsd*)
140
168
    THREAD_LIBS="-lthr"
141
169
    ;;
 
170
darwin*)
 
171
    # none required
 
172
    THREAD_LIBS=
 
173
    ;;
 
174
 
142
175
*)
143
176
    THREAD_LIBS="-pthread"
144
177
esac
153
186
AM_CONDITIONAL(BUILD_PPC, [test "$build_ppc" = "yes"])
154
187
AM_CONDITIONAL(BUILD_ARM, [test "$build_arm" = "yes"])
155
188
 
 
189
AC_MSG_CHECKING([optional compiler flags])
 
190
CXX_FLAG_CHECK(NO_VARIADIC_MACROS, [-Wno-variadic-macros])
 
191
CXX_FLAG_CHECK(NO_MISSING_FIELD_INITIALIZERS, [-Wno-missing-field-initializers])
 
192
AC_MSG_RESULT([$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS])
 
193
 
156
194
AC_OUTPUT([
157
195
    Makefile
158
196
])