← 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-08 21:36:11 UTC
  • mfrom: (77.1.34 codestyle)
  • Revision ID: brian@tangent.org-20080708213611-b0k2zy8eldttqct3
Merging up Monty's changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
4
4
AC_PREREQ(2.61)dnl              Minimum Autoconf version required.
5
5
 
6
6
AC_INIT
7
 
AC_CONFIG_SRCDIR([sql/mysqld.cc])
 
7
AC_CONFIG_SRCDIR([sql/drizzled.cc])
8
8
AC_CONFIG_AUX_DIR(config)
9
9
AC_CONFIG_HEADERS([include/config.h:config.h.in])
10
10
AC_CANONICAL_TARGET
579
579
AC_CHECK_LIB(pthread, pthread_create, [], [AC_MSG_ERROR(could not find libpthread)])
580
580
 
581
581
#--------------------------------------------------------------------
 
582
# Check for libpcre
 
583
#--------------------------------------------------------------------
 
584
 
 
585
AC_PATH_PROG(PKG_CONFIG, pkg-config, AC_MSG_ERROR([pkg-config wasn't found.]))
 
586
PKG_CHECK_MODULES(PCRE, [libpcrecpp >= 3], [
 
587
  ac_cv_have_libpcre=yes
 
588
  AC_DEFINE([HAVE_PCRE], [1], [Perl Compatible Regex Lib for mysqltest])
 
589
  ],[
 
590
  ac_cv_have_libpcre=no
 
591
  AC_MSG_WARN([PCRE not found - mysqltest will not be built])
 
592
  ])
 
593
AM_CONDITIONAL(BUILD_MYSQLTEST, test "x$ac_cv_have_libpcre" = "xyes")
 
594
AC_SUBST(PCRE_LIBS)
 
595
AC_SUBST(PCRE_CFLAGS)
 
596
 
 
597
#--------------------------------------------------------------------
582
598
# Check for system libraries. Adds the library to $LIBS
583
599
# and defines HAVE_LIBM etc
584
600
#--------------------------------------------------------------------
631
647
 
632
648
AC_CHECK_FUNCS(strtok_r)
633
649
 
634
 
 
635
 
# System characteristics
636
 
case $SYSTEM_TYPE in
637
 
  *)
638
 
AC_SYS_RESTARTABLE_SYSCALLS
639
 
    ;;
640
 
esac
641
 
 
642
650
# Build optimized or debug version ?
643
651
# First check for gcc and g++
644
652
if test "$ac_cv_c_compiler_gnu" = "yes"
780
788
AC_CHECK_SIZEOF(char, 1)
781
789
if test "$ac_cv_sizeof_char" -eq 0
782
790
then
783
 
  AC_MSG_ERROR([No size for char type.
784
 
A likely cause for this could be that there isn't any
785
 
static libraries installed. You can verify this by checking if you have libm.a
786
 
in /lib, /usr/lib or some other standard place.  If this is the problem,
787
 
install the static libraries and try again.  If this isn't the problem,
788
 
examine config.log for possible errors.  If you want to report this, use
789
 
'scripts/mysqlbug' and include at least the last 20 rows from config.log!])
 
791
  AC_MSG_ERROR([No size for char type.])
790
792
fi
791
793
AC_CHECK_SIZEOF(char*, 4)
792
794
AC_CHECK_SIZEOF(short, 2)
1206
1208
AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
1207
1209
 
1208
1210
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile mysys/tests/Makefile dnl
1209
 
 strings/Makefile strings/tests/Makefile regex/Makefile storage/Makefile dnl
 
1211
 strings/Makefile strings/tests/Makefile storage/Makefile dnl
1210
1212
 vio/Makefile dnl
1211
1213
 libmysql/Makefile client/Makefile dnl
1212
1214
 sql/Makefile sql/share/Makefile dnl
1213
1215
 sql/sql_builtin.cc sql-common/Makefile dnl
1214
 
 dbug/Makefile scripts/Makefile include/Makefile dnl
 
1216
 dbug/Makefile include/Makefile dnl
1215
1217
 support-files/Makefile dnl
1216
 
 mysql-test/Makefile dnl
1217
 
 include/mysql_version.h plugin/Makefile)
 
1218
 mysql-test/Makefile mysql-test/install_test_db dnl
 
1219
 include/mysql_version.h plugin/Makefile dnl
 
1220
 sql/drizzled_safe support-files/libmysqlclient.pc dnl
 
1221
 support-files/mysql.server support-files/mysql-log-rotate)
1218
1222
 
1219
1223
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
1220
1224