← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2008-07-19 21:15:52 UTC
  • Revision ID: brian@tangent.org-20080719211552-kqycxgu2pi1g64y6
Refactor of configure.ac. Added profile. One note... I believe this should
not affect FreeBSD since we now use libtool, but I may be wrong.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
188
188
  AC_PATH_PROG(AS, as, as)
189
189
fi
190
190
 
191
 
# Still need ranlib for readline; local static use only so no libtool.
192
 
AC_PROG_RANLIB
193
191
# We use libtool
194
192
#AC_LIBTOOL_WIN32_DLL
195
193
AC_PROG_LIBTOOL
536
534
  AC_MSG_RESULT([no])
537
535
fi
538
536
 
539
 
# Add query profiler
540
 
AC_MSG_CHECKING(if SHOW PROFILE should be enabled.)
541
 
AC_ARG_ENABLE([profiling],
542
 
    [AS_HELP_STRING([--enable-profiling], 
543
 
            [Build a version with query profiling code])],
544
 
    [ ENABLED_PROFILING=$enableval ],
545
 
    [ ENABLED_PROFILING=no ])
546
 
 
547
 
if test "$ENABLED_PROFILING" = "yes"
548
 
then
549
 
  AC_DEFINE([ENABLED_PROFILING], [1],
550
 
            [If SHOW PROFILE should be enabled])
551
 
  AC_MSG_RESULT([yes]) 
552
 
else
553
 
  AC_MSG_RESULT([no])
554
 
fi
555
 
 
556
537
AC_ARG_WITH([tcp-port],
557
538
    [AS_HELP_STRING([--with-tcp-port=port-number],
558
539
            [Which port to use for Drizzle services @<:@default=4427@:>@])],
765
746
  TARGET_LINUX="false"
766
747
fi
767
748
 
768
 
AC_MSG_CHECKING("need of special linking flags")
769
 
if test "$TARGET_LINUX" = "true" -a "$ac_cv_c_compiler_gnu" = "yes" -a "$all_is_static" != "yes"
770
 
then
771
 
  LDFLAGS="$LDFLAGS -rdynamic"
772
 
  AC_MSG_RESULT("-rdynamic")
773
 
else
774
 
  case "$SYSTEM_TYPE$with_mysqld_ldflags " in
775
 
  *freebsd*"-all-static "*|*dragonfly*"-all-static "*)
776
 
    AC_MSG_RESULT("none")
777
 
    ;;
778
 
  *freebsd*|*dragonfly*)
779
 
    MYSQLD_EXTRA_LDFLAGS="$MYSQLD_EXTRA_LDFLAGS -export-dynamic"
780
 
    AC_MSG_RESULT("-export-dynamic")
781
 
    ;;
782
 
  *)
783
 
    AC_MSG_RESULT("none")
784
 
    ;;
785
 
  esac
786
 
fi
787
 
 
788
749
dnl Checks for typedefs, structures, and compiler characteristics.
789
750
AC_C_CONST
790
751
AC_C_INLINE
1151
1112
AC_SUBST(mysql_plugin_libs)
1152
1113
AC_SUBST(mysql_plugin_defs)
1153
1114
 
 
1115
AC_ARG_ENABLE([profiling],
 
1116
    [AS_HELP_STRING([--enable-profiling],
 
1117
       [Toggle profiling @<:@default=off@:>@])],
 
1118
    [ac_profiling="$enableval"],
 
1119
    [ac_profiling="no"])
 
1120
 
 
1121
AC_ARG_ENABLE([coverage],
 
1122
    [AS_HELP_STRING([--enable-coverage],
 
1123
       [Toggle coverage @<:@default=off@:>@])],
 
1124
    [ac_coverage="$enableval"],
 
1125
    [ac_coverage="no"])
 
1126
 
1154
1127
AC_ARG_ENABLE([pedantic-warnings],
1155
1128
    [AS_HELP_STRING([--disable-pedantic-warnings],
1156
1129
       [Toggle pedanticness @<:@default=on@:>@])],
1199
1172
    W_STRICT_ALIASING="-Wno-strict-aliasing"
1200
1173
  fi
1201
1174
 
 
1175
  if test "$ac_profiling" = "yes"
 
1176
  then
 
1177
    GPROF_PROFILING="-pg"
 
1178
  else
 
1179
    GPROF_PROFILING=" "
 
1180
  fi
 
1181
 
 
1182
  if test "$ac_coverage" = "yes"
 
1183
  then
 
1184
    GPROF_COVERAGE="-fprofile-arcs -ftest-coverage"
 
1185
  else
 
1186
    GPROF_COVERAGE=" "
 
1187
  fi
 
1188
 
1202
1189
  if test "$ac_warn_pedantic" = "yes"
1203
1190
  then
1204
1191
    GCC_PEDANTIC="-pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls ${W_STRICT_ALIASING}"
1216
1203
  fi
1217
1204
 
1218
1205
  BASE_WARNINGS="-W -Wall -Wextra"
1219
 
  GCC_WARNINGS="${BASE_WARNINGS} -std=gnu99 ${GCC_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL}"
1220
 
  GXX_WARNINGS="${BASE_WARNINGS} -std=gnu++98 ${GXX_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL}"
 
1206
  GCC_WARNINGS="${BASE_WARNINGS} -std=gnu99 ${GCC_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
 
1207
  GXX_WARNINGS="${BASE_WARNINGS} -std=gnu++98 ${GXX_PEDANTIC} ${W_UNREACHABLE} ${W_FAIL} ${GPROF_PROFILING} ${GPROF_COVERAGE}"
1221
1208
 
1222
1209
  CXXFLAGS="$CXXFLAGS ${GXX_WARNINGS}"
1223
1210
  CFLAGS="$CFLAGS ${GCC_WARNINGS} "