← 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-24 01:17:13 UTC
  • mfrom: (202.1.18 codestyle)
  • Revision ID: brian@tangent.org-20080724011713-5jceruz4bd4oawaq
Merge Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
340
340
AC_SUBST(ZLIB_LIBS)
341
341
 
342
342
 
 
343
#--------------------------------------------------------------------
 
344
# Check for libreadline or compatible (libedit on Mac OS X)
 
345
#--------------------------------------------------------------------
343
346
 
344
347
AC_CHECK_HEADERS([readline/readline.h])
345
348
if test "x$ac_cv_header_readline_readline_h" != "xyes"
353
356
LIBS="$my_save_LIBS"
354
357
AC_SUBST(READLINE_LIBS)
355
358
 
 
359
MYSQL_CHECK_NEW_RL_INTERFACE
 
360
 
356
361
#--------------------------------------------------------------------
357
362
# Check for libpcre
358
363
#--------------------------------------------------------------------
380
385
AC_SUBST(PCRE_LIBS)
381
386
AC_SUBST(PCRE_CFLAGS)
382
387
 
383
 
AM_PATH_GLIB_2_0
384
 
if test "x$no_glib" != "x" ; then
385
 
    AC_MSG_ERROR([Couldn't find GLib2. Try installing libglib2.0-dev or glib2-devel])
386
 
fi
387
 
 
388
388
dnl Find paths to some shell programs
389
389
AC_PATH_PROG(LN, ln, ln)
390
390
# This must be able to take a -f flag like normal unix ln.
632
632
AC_CHECK_HEADERS(sys/fpu.h utime.h sys/utime.h )
633
633
AC_CHECK_HEADERS(synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h)
634
634
AC_CHECK_HEADERS(sys/timeb.h sys/vadvise.h sys/wait.h term.h)
635
 
AC_CHECK_HEADERS(termio.h termios.h sched.h crypt.h alloca.h)
 
635
AC_CHECK_HEADERS(termio.h termios.h sched.h alloca.h)
636
636
AC_CHECK_HEADERS(sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h)
637
637
AC_CHECK_HEADERS(sys/prctl.h sys/resource.h sys/param.h port.h ieeefp.h)
638
638
AC_CHECK_HEADERS(execinfo.h)
727
727
  DEBUG_OPTIMIZE_CXX=""
728
728
fi
729
729
 
 
730
AC_HEADER_ASSERT
 
731
 
730
732
CFLAGS="${SYMBOLS_CFLAGS} ${CFLAGS}"
731
733
CXXFLAGS="${SYMBOLS_CXXFLAGS} ${CXXFLAGS}"
732
734
 
1263
1265
 strings/Makefile strings/tests/Makefile storage/Makefile dnl
1264
1266
 vio/Makefile dnl
1265
1267
 libdrizzle/Makefile client/Makefile dnl
1266
 
 server/Makefile server/share/Makefile dnl
 
1268
 server/Makefile dnl
 
1269
 server/field/Makefile dnl
 
1270
 server/share/Makefile dnl
1267
1271
 server/sql_builtin.cc dnl
1268
1272
 include/Makefile dnl
1269
1273
 support-files/Makefile dnl