From 6086690b49ed86cc5cfdc9657b1e96e1ba505823 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 13 Nov 2017 09:05:45 -0500 Subject: [PATCH] TT#24601 Revert "TT#24224 Switch to use libmariadb-dev" This reverts commit e65f1fa26a79a25f3b057a639370ecdf5c05b5ec. Change-Id: I55831380afa38a79b6fc85adc6d057a76cf38b6e --- Makefile | 6 ++---- debian/control | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e7dbc96..e0033a8 100644 --- a/Makefile +++ b/Makefile @@ -7,13 +7,11 @@ CC := gcc CPPFLAGS := -DMEDIATOR_VERSION="\"$(VERSION)\"" GLIB_CFLAGS := $(shell pkg-config glib-2.0 --cflags) -MARIADB_CFLAGS := $(shell mariadb_config --cflags) -CFLAGS := $(GLIB_CFLAGS) $(MARIADB_CFLAGS) -g -Wall -O2 +CFLAGS := -I/usr/include/mysql $(GLIB_CFLAGS) -g -Wall -O2 #CFLAGS += -DWITH_TIME_CALC GLIB_LDFLAGS := $(shell pkg-config glib-2.0 --libs) -MARIADB_LDFLAGS := $(shell mariadb_config --libs) -LDFLAGS := $(GLIB_LDFLAGS) $(MARIADB_LDFLAGS) +LDFLAGS := $(GLIB_LDFLAGS) -lmysqlclient CFILES := $(wildcard *.c) OFILES := $(CFILES:.c=.o) diff --git a/debian/control b/debian/control index 5aeef26..26414d2 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Sipwise Development Team Build-Depends: debhelper (>= 9), - libmariadb-dev-compat, + default-libmysqlclient-dev | libmysqlclient15-dev, libglib2.0-dev, Standards-Version: 3.9.8 Homepage: https://www.sipwise.com/