From 5a4de87df122302d5e6e739e5e1a425d33d71060 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 14 Sep 2010 19:26:45 -0400 Subject: Fixed configure failing on some systems which have a partial MySQL installation --- configure | 1 + configure.in | 1 + version.log | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 96cabf90f..5ae3e0197 100755 --- a/configure +++ b/configure @@ -3644,6 +3644,7 @@ _ACEOF else CFLAGS="$hold_cflags" LDFLAGS="$hold_ldflags" + LIBS="" fi fi diff --git a/configure.in b/configure.in index af007c228..1a8c0c755 100644 --- a/configure.in +++ b/configure.in @@ -123,6 +123,7 @@ int main() else CFLAGS="$hold_cflags" LDFLAGS="$hold_ldflags" + LIBS="" fi fi ]) diff --git a/version.log b/version.log index f149342d2..8a1766b1f 100644 --- a/version.log +++ b/version.log @@ -8,9 +8,10 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="5" VERSION_EXTRA="-git" -VERSION_BUILD="3039" +VERSION_BUILD="3040" # $Log$ # Changes since 1.8.5 Release +#Revision 3040 - Fixed configure failing on some systems which have a partial MySQL installation #Revision 3039 - Fixed db-merger handling some hostserv collisions #Revision 3038 - Initialise git for 1.8-git -- cgit