summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2010-09-14 19:26:45 -0400
committerAdam <Adam@anope.org>2010-09-14 19:26:45 -0400
commit5a4de87df122302d5e6e739e5e1a425d33d71060 (patch)
treea8fdaf411f9d3f3179e5830acdc7b41885f2f8cd
parent9a488327b200f3be4efd20a084b674177714e962 (diff)
Fixed configure failing on some systems which have a partial MySQL installation
-rwxr-xr-xconfigure1
-rw-r--r--configure.in1
-rw-r--r--version.log3
3 files changed, 4 insertions, 1 deletions
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