Bug#38363: marked as done (patch for chpp to support mysql properly)
Your message dated Sun, 25 Mar 2001 10:36:24 +0200
with message-id <20010325103624.J4660@om>
and subject line Bug#38363: patch for chpp to support mysql properly
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Darren Benham
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 26 May 1999 14:24:02 +0000
Received: (qmail 9237 invoked from network); 26 May 1999 14:23:55 -0000
Received: from atlas.cc.uoa.gr (HELO proton.local) (195.134.68.5)
by master.debian.org with SMTP; 26 May 1999 14:23:55 -0000
Received: from proton (localhost [127.0.0.1])
by proton.local (8.9.3/8.9.3/Debian/GNU) with SMTP id RAA11679
for <submit@bugs.debian.org>; Wed, 26 May 1999 17:24:32 +0300
From: Konstantinos Margaritis <kmargar@cc.uoa.gr>
To: submit@bugs.debian.org
Subject: patch for chpp to support mysql properly
Date: Wed, 26 May 1999 17:05:09 +0300
X-Mailer: KMail [version 1.0.21]
Content-Type: text/plain
MIME-Version: 1.0
Message-Id: <99052617230302.07052@proton>
Content-Transfer-Encoding: 8bit
Package: chpp
Version: 0.3.4-1
Note that after applying the patch, aclocal && autoconf should be run to
update the configure script.
-------------------------
diff -ruN chpp-0.3.4.orig/acinclude.m4 chpp-0.3.4/acinclude.m4
--- chpp-0.3.4.orig/acinclude.m4 Fri Dec 4 07:29:37 1998
+++ chpp-0.3.4/acinclude.m4 Wed May 26 16:38:08 1999
@@ -10,7 +10,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS -I$mysql_config_prefix/include"
LIBS="$LIBS -L$mysql_config_prefix/lib/mysql -lmysqlclient -lm"
- AC_TRY_LINK([#include <mysql/mysql.h>
+ AC_TRY_LINK([#include <mysql.h>
],[mysql_connect(0, 0, 0, 0);], no_mysql="no", no_mysql="yes")
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
@@ -20,7 +20,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS -I/usr/local/include"
LIBS="$LIBS -L/usr/local/lib/mysql -lmysqlclient -lm"
- AC_TRY_LINK([#include <mysql/mysql.h>
+ AC_TRY_LINK([#include <mysql.h>
],[mysql_connect(0, 0, 0, 0);], no_mysql="no"
mysql_config_prefix="/usr/local")
CFLAGS="$ac_save_CFLAGS"
@@ -31,7 +31,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS -I/usr/include"
LIBS="$LIBS -L/usr/lib/mysql -lmysqlclient -lm"
- AC_TRY_LINK([#include <mysql/mysql.h>
+ AC_TRY_LINK([#include <mysql.h>
],[mysql_connect(0, 0, 0, 0);], no_mysql="no"
mysql_config_prefix="/usr", no_mysql="yes")
CFLAGS="$ac_save_CFLAGS"
diff -ruN chpp-0.3.4.orig/aclocal.m4 chpp-0.3.4/aclocal.m4
--- chpp-0.3.4.orig/aclocal.m4 Fri Dec 4 07:29:37 1998
+++ chpp-0.3.4/aclocal.m4 Wed May 26 16:38:26 1999
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.4
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -22,7 +22,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS -I$mysql_config_prefix/include"
LIBS="$LIBS -L$mysql_config_prefix/lib/mysql -lmysqlclient -lm"
- AC_TRY_LINK([#include <mysql/mysql.h>
+ AC_TRY_LINK([#include <mysql.h>
],[mysql_connect(0, 0, 0, 0);], no_mysql="no", no_mysql="yes")
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
@@ -32,7 +32,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS -I/usr/local/include"
LIBS="$LIBS -L/usr/local/lib/mysql -lmysqlclient -lm"
- AC_TRY_LINK([#include <mysql/mysql.h>
+ AC_TRY_LINK([#include <mysql.h>
],[mysql_connect(0, 0, 0, 0);], no_mysql="no"
mysql_config_prefix="/usr/local")
CFLAGS="$ac_save_CFLAGS"
@@ -43,7 +43,7 @@
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS -I/usr/include"
LIBS="$LIBS -L/usr/lib/mysql -lmysqlclient -lm"
- AC_TRY_LINK([#include <mysql/mysql.h>
+ AC_TRY_LINK([#include <mysql.h>
],[mysql_connect(0, 0, 0, 0);], no_mysql="no"
mysql_config_prefix="/usr", no_mysql="yes")
CFLAGS="$ac_save_CFLAGS"
@@ -130,7 +130,7 @@
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+[AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1]
AC_SUBST(PACKAGE)
VERSION=[$2]
@@ -140,8 +140,8 @@
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
AC_REQUIRE([AM_SANITY_CHECK])
AC_REQUIRE([AC_ARG_PROGRAM])
dnl FIXME This is truly gross.
@@ -152,15 +152,6 @@
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
#
# Check to make sure that the build environment is sane.
diff -ruN chpp-0.3.4.orig/builtins/database/mysql.c chpp-0.3.4/builtins/database/mysql.c
--- chpp-0.3.4.orig/builtins/database/mysql.c Fri Dec 4 07:29:39 1998
+++ chpp-0.3.4/builtins/database/mysql.c Wed May 26 16:43:50 1999
@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <assert.h>
-#include <mysql/mysql.h>
+#include <mysql.h>
#include "../../memory.h"
#include "../../error.h"
diff -ruN chpp-0.3.4.orig/debian/rules chpp-0.3.4/debian/rules
--- chpp-0.3.4.orig/debian/rules Wed May 26 16:58:23 1999
+++ chpp-0.3.4/debian/rules Wed May 26 16:28:58 1999
@@ -10,7 +10,7 @@
build-stamp:
dh_testdir
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --with-mysql-prefix=/usr
# Add here commands to compile the package.
$(MAKE)
-------------------------
--
Konstantinos Margaritis
---------------------------------------
Received: (at 38363-done) by bugs.debian.org; 25 Mar 2001 08:43:18 +0000
>From mvela@public.srce.hr Sun Mar 25 02:43:18 2001
Return-path: <mvela@public.srce.hr>
Received: from jagor.srce.hr [161.53.2.130] (root)
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 14h67J-0002HA-00; Sun, 25 Mar 2001 02:43:17 -0600
Received: from om (asy68.jmu.carnet.hr [193.198.128.68])
by jagor.srce.hr (8.9.0/8.9.0) with ESMTP id KAA12345
for <38363-done@bugs.debian.org>; Sun, 25 Mar 2001 10:43:15 +0200 (MET DST)
Received: from mvela by om with local (Exim 3.22 #1 (Debian))
id 14h60j-0001Ey-00
for <38363-done@bugs.debian.org>; Sun, 25 Mar 2001 10:36:29 +0200
Date: Sun, 25 Mar 2001 10:36:24 +0200
From: Matej Vela <vela@debian.org>
To: 38363-done@bugs.debian.org
Subject: Bug#38363: patch for chpp to support mysql properly
Message-ID: <20010325103624.J4660@om>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.3.15i
X-Accept-Language: en, hr
Sender: Matej Vela <mvela@om>
Delivered-To: 38363-done@bugs.debian.org
libmysqlclient10-dev puts headers in /usr/include/mysql, so your patch
is unnecessary.
Thanks,
Matej
Reply to: