← 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-12-02 21:16:50 UTC
  • mto: This revision was merged to the branch mainline in revision 641.
  • Revision ID: mordred@solanthus.local-20081202211650-r0adnzw0v9hbke7b
Removed AM_CONDITIONAL from SEARCH_FOR_LIB. Aligned naming of AM_CONDITIONALS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
174
174
AC_SUBST(AVAILABLE_LANGUAGES)
175
175
 
176
176
dnl Ok. This is sort of lame, but we need to be nice to plugins Makefile.am's.
177
 
AM_CONDITIONAL(BUILDING_DRIZZLE,[test "x" = "x"])
 
177
AM_CONDITIONAL(BUILD_DRIZZLE,[test "x" = "x"])
178
178
 
179
179
 
180
180
# General Constants
608
608
        )
609
609
        ]
610
610
)
611
 
AM_CONDITIONAL([HAVE_TINFO],[test "$ac_cv_have_tinfo" = "yes"])
612
611
 
613
612
#--------------------------------------------------------------------
614
613
# Check for libreadline or compatible (libedit on Mac OS X)
651
650
  SEARCH_FOR_LIB(pcre, pcre_compile, pcre.h, 
652
651
                 AC_MSG_ERROR([libpcre is required for Drizzle]))
653
652
fi
654
 
AM_CONDITIONAL([HAVE_PCRE],[test "$ac_cv_have_pcre" = "yes"])
655
653
AC_SUBST(PCRE_LIBS)
656
654
AC_SUBST(PCRE_CFLAGS)
657
655
 
1508
1506
 
1509
1507
dnl GCC Precompiled Header Support
1510
1508
dnl re-enable later
1511
 
dnl AM_CONDITIONAL([GCC_PCH],[test "$GCC" = "yes"])
1512
 
AM_CONDITIONAL([GCC_PCH],[test "no" = "yes"])
 
1509
dnl AM_CONDITIONAL([BUILD_GCC_PCH],[test "$GCC" = "yes"])
 
1510
AM_CONDITIONAL([BUILD_GCC_PCH],[test "no" = "yes"])
1513
1511
 
1514
1512
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
1515
1513
 mystrings/Makefile storage/Makefile dnl