SOURCES: mysql-query-browser-configure.patch (NEW) - fix build wit...
glen
glen at pld-linux.org
Wed Feb 15 21:04:52 CET 2006
Author: glen Date: Wed Feb 15 20:04:52 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix build with global configure cache
---- Files affected:
SOURCES:
mysql-query-browser-configure.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/mysql-query-browser-configure.patch
diff -u /dev/null SOURCES/mysql-query-browser-configure.patch:1.1
--- /dev/null Wed Feb 15 21:04:52 2006
+++ SOURCES/mysql-query-browser-configure.patch Wed Feb 15 21:04:47 2006
@@ -0,0 +1,30 @@
+sync PCRE_ macros so the cache file can be reused, otherwise you'll end with:
+
+mysql-gui-common cache file: ac_cv_prog_PCRE_CFLAGS=${ac_cv_prog_PCRE_CFLAGS=yes}
+mysql-query-browser cache file: ac_cv_prog_PCRE_CFLAGS=${ac_cv_prog_PCRE_CFLAGS=}
+
+--- mysql-query-browser-1.1.18/mysql-gui-common/configure.in~ 2006-01-03 05:59:02.000000000 +0200
++++ mysql-query-browser-1.1.18/mysql-gui-common/configure.in 2006-02-15 21:36:36.000000000 +0200
+@@ -226,19 +226,11 @@
+ #
+ # pcre
+ #
+-AC_CHECK_PROG(PCRE_CFLAGS,pcre-config,[yes])
+-if test "$PCRE_CFLAGS" != yes; then
+- AC_MSG_ERROR([Could not find pcre-config script. Make sure the pcre libraries are installed])
+-else
+- PCRE_CFLAGS=`pcre-config --cflags`
+-fi
+-AC_SUBST(PCRE_CFLAGS)
+-
+-
+ AC_CHECK_PROG(PCRE_LIBS,pcre-config,`pcre-config --libs`)
+-if test -z "$PCRE_LIBS"; then
+- AC_MSG_ERROR([Could not find pcre-config script. Make sure the pcre libraries are installed])
++if test -z "$PCRE_LIBS"; then AC_MSG_ERROR([Could not find pcre-config script. Make sure the pcre libraries are installed])
+ fi
++AC_CHECK_PROG(PCRE_CFLAGS,pcre-config,`pcre-config --cflags`)
++AC_SUBST(PCRE_CFLAGS)
+ AC_SUBST(PCRE_LIBS)
+
+ # path mangling
================================================================
More information about the pld-cvs-commit
mailing list