← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2008-07-22 05:29:20 UTC
  • mto: (202.1.3 toru)
  • mto: This revision was merged to the branch mainline in revision 204.
  • Revision ID: monty@inaugust.com-20080722052920-vohteox3yxfpbfvs
Cleaned up some LIBS bits in the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
290
290
then
291
291
  AC_MSG_ERROR([Couldn't find event.h. Try installing libevent development packages])
292
292
fi
 
293
my_save_LIBS="$LIBS"
 
294
LIBS=""
293
295
AC_CHECK_LIB(event, event_loop, [], [AC_MSG_ERROR(could not find libevent)])
 
296
LIBEVENT_LIBS="${LIBS}"
 
297
LIBS="${my_save_LIBS}"
 
298
AC_SUBST(LIBEVENT_LIBS)
294
299
 
295
300
#--------------------------------------------------------------------
296
301
# Check for libpthread
322
327
# Check for libz
323
328
#--------------------------------------------------------------------
324
329
 
 
330
my_save_LIBS="$LIBS"
 
331
LIBS=""
325
332
AC_CHECK_HEADERS(zlib.h)
326
333
if test "x$ac_cv_header_zlib_h" != "xyes"
327
334
then
328
335
  AC_MSG_ERROR([Couldn't find zlib.h. Try installing zlib development packages])
329
336
fi
330
337
AC_CHECK_LIB(z, crc32, [], [AC_MSG_ERROR(could not find libz)])
 
338
ZLIB_LIBS="$LIBS"
 
339
LIBS="$my_save_LIBS"
 
340
AC_SUBST(ZLIB_LIBS)
 
341
 
331
342
 
332
343
 
333
344
AC_CHECK_HEADERS([readline/readline.h])
335
346
then
336
347
  AC_MSG_ERROR([Couldn't find readline/readline.h. Try installing readline development packages.])
337
348
fi
 
349
my_save_LIBS="$LIBS"
 
350
LIBS=""
 
351
AC_CHECK_LIB(readline, rl_completion_matches, [], [AC_MSG_ERROR(Couldn't find libreadline.)])
 
352
READLINE_LIBS="$LIBS"
 
353
LIBS="$my_save_LIBS"
 
354
AC_SUBST(READLINE_LIBS)
338
355
 
339
356
#--------------------------------------------------------------------
340
357
# Check for libpcre
668
685
then
669
686
  AC_MSG_ERROR([Drizzle requires dlopen])
670
687
fi
671
 
LIBDL=$LIBS
 
688
LIBDL_LIBS="$LIBS"
672
689
LIBS="$my_save_LIBS"
673
 
AC_SUBST(LIBDL)
 
690
AC_SUBST(LIBDL_LIBS)
674
691
 
675
692
AC_CHECK_FUNCS(strtok_r)
676
693
 
878
895
then
879
896
  MYSQL_CHECK_LIB_TERMCAP
880
897
else
881
 
  TERMCAP_LIB="$with_named_curses"
 
898
  TERMCAP_LIBS="$with_named_curses"
882
899
fi
883
 
AC_SUBST(TERMCAP_LIB)
 
900
AC_SUBST(TERMCAP_LIBS)
884
901
 
885
902
# Check if the termcap function 'tgoto' is already declared in
886
903
# system header files or if it need to be declared locally