* [Buildroot] [PATCH v3 1/3] package/radlib: New package
@ 2016-04-06 12:21 ray.kinsella at intel.com
2016-04-06 12:21 ` [Buildroot] [PATCH v3 2/3] package/radlib: Renamed configure.in to configure.ac ray.kinsella at intel.com
2016-04-06 12:21 ` [Buildroot] [PATCH v3 3/3] package/radlib: reworked autotools with pkg-config ray.kinsella at intel.com
0 siblings, 2 replies; 3+ messages in thread
From: ray.kinsella at intel.com @ 2016-04-06 12:21 UTC (permalink / raw)
To: buildroot
From: Ray Kinsella <ray.kinsella@intel.com>
radlib is a rapid application development library for unix
multi-process applications. It uses SYS V IPC facilities and
FIFOs to provide an RTOS-like, event-driven, distributed
framework. Processes may be run as daemons or have a controlling
terminal.
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
---
package/Config.in | 1 +
package/radlib/Config.in | 37 +++++++++++++++++++++++++++++++++++++
package/radlib/radlib.hash | 2 ++
package/radlib/radlib.mk | 28 ++++++++++++++++++++++++++++
4 files changed, 68 insertions(+)
create mode 100644 package/radlib/Config.in
create mode 100644 package/radlib/radlib.hash
create mode 100644 package/radlib/radlib.mk
diff --git a/package/Config.in b/package/Config.in
index 64822bf..6c59556 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1262,6 +1262,7 @@ endif
source "package/protobuf-c/Config.in"
source "package/qhull/Config.in"
source "package/qlibc/Config.in"
+ source "package/radlib/Config.in"
source "package/startup-notification/Config.in"
source "package/tz/Config.in"
source "package/tzdata/Config.in"
diff --git a/package/radlib/Config.in b/package/radlib/Config.in
new file mode 100644
index 0000000..e77e03c
--- /dev/null
+++ b/package/radlib/Config.in
@@ -0,0 +1,37 @@
+config BR2_PACKAGE_RADLIB
+ bool "radlib"
+ help
+ radlib is a rapid application development library for unix
+ multi-process applications. It uses SYS V IPC facilities and
+ FIFOs to provide an RTOS-like, event-driven, distributed framework.
+ Processes may be run as daemons or have a controlling terminal.
+
+ http://sourceforge.net/projects/radlib/
+
+choice
+ prompt "radlib database backend"
+ depends on BR2_PACKAGE_RADLIB
+ depends on BR2_PACKAGE_SQLITE \
+ || BR2_PACKAGE_MYSQL \
+ || BR2_PACKAGE_POSTGRESQL
+ help$
+ Selects the backend database: sqlite, mysql or postgresql
+
+config BR2_PACKAGE_RADLIB_SQLITE
+ bool "sqlite"
+ depends on BR2_PACKAGE_SQLITE
+ help
+ Configure radlib to use a sqlite database backend
+
+config BR2_PACKAGE_RADLIB_MYSQL
+ bool "mysql"
+ depends on BR2_PACKAGE_MYSQL
+ help
+ Configure radlib to use a mysql database backend
+
+config BR2_PACKAGE_RADLIB_POSTGRESQL
+ bool "postgresql"
+ depends on BR2_PACKAGE_POSTGRESQL
+ help
+ Configure radlib to use a postgresql database backend
+endchoice
diff --git a/package/radlib/radlib.hash b/package/radlib/radlib.hash
new file mode 100644
index 0000000..2fbfbba
--- /dev/null
+++ b/package/radlib/radlib.hash
@@ -0,0 +1,2 @@
+# From http://sourceforge.net/projects/radlib/files/
+sha256 82b98bb5e08a500dea1e4252843b9c772fa1fb67ac8ab89ed64abdd5e22eca66 radlib-2.12.0.tar.gz
diff --git a/package/radlib/radlib.mk b/package/radlib/radlib.mk
new file mode 100644
index 0000000..5ff55ac
--- /dev/null
+++ b/package/radlib/radlib.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# radlib
+#
+################################################################################
+
+RADLIB_VERSION = 2.12.0
+RADLIB_SITE = http://downloads.sourceforge.net/radlib
+RADLIB_INSTALL_STAGING = YES
+RADLIB_LICENSE = BSD-2c
+RADLIB_LICENSE_FILES = COPYING
+RADLIB_AUTORECONF = YES
+RADLIB_DEPENDENCIES = host-pkgconf
+
+ifeq ($(BR2_PACKAGE_RADLIB_SQLITE),y)
+ RADLIB_CONF_OPTS += --with-sqlite
+endif
+
+ifeq ($(BR2_PACKAGE_RADLIB_MYSQL),y)
+ RADLIB_CONF_ENV=ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
+ RADLIB_CONF_OPTS += --with-mysql
+endif
+
+ifeq ($(BR2_PACKAGE_RADLIB_POSTGRESQL),y)
+ RADLIB_CONF_OPTS += --with-postgresql
+endif
+
+$(eval $(autotools-package))
--
2.4.11
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 2/3] package/radlib: Renamed configure.in to configure.ac
2016-04-06 12:21 [Buildroot] [PATCH v3 1/3] package/radlib: New package ray.kinsella at intel.com
@ 2016-04-06 12:21 ` ray.kinsella at intel.com
2016-04-06 12:21 ` [Buildroot] [PATCH v3 3/3] package/radlib: reworked autotools with pkg-config ray.kinsella at intel.com
1 sibling, 0 replies; 3+ messages in thread
From: ray.kinsella at intel.com @ 2016-04-06 12:21 UTC (permalink / raw)
To: buildroot
From: Ray Kinsella <ray.kinsella@intel.com>
configure.ac is now standard for autotools, this supresses a
warning on autoreconf.
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
---
...dlib-renamed-configure.in-to-configure.ac.patch | 213 +++++++++++++++++++++
1 file changed, 213 insertions(+)
create mode 100644 package/radlib/0001-radlib-renamed-configure.in-to-configure.ac.patch
diff --git a/package/radlib/0001-radlib-renamed-configure.in-to-configure.ac.patch b/package/radlib/0001-radlib-renamed-configure.in-to-configure.ac.patch
new file mode 100644
index 0000000..c808ba7
--- /dev/null
+++ b/package/radlib/0001-radlib-renamed-configure.in-to-configure.ac.patch
@@ -0,0 +1,213 @@
+From d3a51cf6492e062383dd49ee604aa1f77cdd47b0 Mon Sep 17 00:00:00 2001
+From: Ray Kinsella <ray.kinsella@intel.com>
+Date: Wed, 6 Apr 2016 11:23:45 +0100
+Subject: [PATCH 1/2] radlib: renamed configure.in to configure.ac
+
+configure.ac is now standard for autotools, this supresses a warning on
+autoreconf
+
+Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
+---
+ configure.ac | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.in | 91 ------------------------------------------------------------
+ 2 files changed, 91 insertions(+), 91 deletions(-)
+ create mode 100644 configure.ac
+ delete mode 100644 configure.in
+
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..47e507e
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,91 @@
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ(2.5)
++AC_INIT([radlib],[2.12.0],[mteel2005 at gmail.com])
++AC_CONFIG_SRCDIR([h/radmsgLog.h])
++AM_INIT_AUTOMAKE([radlib],[2.12.0])
++AM_CONFIG_HEADER([config.h])
++
++AC_ARG_ENABLE(mysql,
++[ --enable-mysql include radlib MySQL database support],
++[case "${enableval}" in
++ yes) mysql=true ;;
++ no) mysql=false ;;
++ *) mysql=false ;;
++esac],[mysql=false])
++AM_CONDITIONAL(MYSQL, test x$mysql = xtrue)
++
++AC_ARG_ENABLE(pgresql,
++[ --enable-pgresql include radlib postgreSQL database support],
++[case "${enableval}" in
++ yes) pgresql=true ;;
++ no) pgresql=false ;;
++ *) pgresql=false ;;
++esac],[pgresql=false])
++AM_CONDITIONAL(PGRESQL, test x$pgresql = xtrue)
++
++AC_ARG_ENABLE(sqlite,
++[ --enable-sqlite include radlib sqlite database support],
++[case "${enableval}" in
++ yes) sqlite=true ;;
++ no) sqlite=false ;;
++ *) sqlite=false ;;
++esac],[sqlite=false])
++AM_CONDITIONAL(SQLITE, test x$sqlite = xtrue)
++
++# Check for big endian host:
++AC_C_BIGENDIAN()
++
++# Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LIBTOOL
++
++# Set a flag here if we are cross compiling (must be after AC_PROG_CC)
++AM_CONDITIONAL(CROSSCOMPILE, test x$cross_compiling = xyes)
++
++# Checks for libraries.
++AC_CHECK_LIB([c], [strncpy])
++AC_CHECK_LIB([m], [exp])
++
++# Checks for header files.
++AC_HEADER_STDC
++AC_HEADER_SYS_WAIT
++AC_CHECK_HEADERS([fcntl.h \
++ stdlib.h \
++ string.h \
++ sys/time.h \
++ syslog.h \
++ termios.h \
++ unistd.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++AC_TYPE_PID_T
++AC_HEADER_TIME
++AC_STRUCT_TM
++
++# Checks for library functions.
++AC_FUNC_FORK
++AC_FUNC_MALLOC
++AC_FUNC_SELECT_ARGTYPES
++AC_TYPE_SIGNAL
++AC_FUNC_STAT
++AC_FUNC_VPRINTF
++AC_CHECK_FUNCS([getcwd \
++ gethostname \
++ gettimeofday \
++ memset \
++ mkdir \
++ mkfifo \
++ select \
++ strchr \
++ strerror \
++ strrchr])
++
++AC_CONFIG_FILES([Makefile \
++ src/Makefile \
++ msgRouter/Makefile \
++ debug/Makefile])
++AC_OUTPUT
++
+diff --git a/configure.in b/configure.in
+deleted file mode 100644
+index 47e507e..0000000
+--- a/configure.in
++++ /dev/null
+@@ -1,91 +0,0 @@
+-# Process this file with autoconf to produce a configure script.
+-
+-AC_PREREQ(2.5)
+-AC_INIT([radlib],[2.12.0],[mteel2005 at gmail.com])
+-AC_CONFIG_SRCDIR([h/radmsgLog.h])
+-AM_INIT_AUTOMAKE([radlib],[2.12.0])
+-AM_CONFIG_HEADER([config.h])
+-
+-AC_ARG_ENABLE(mysql,
+-[ --enable-mysql include radlib MySQL database support],
+-[case "${enableval}" in
+- yes) mysql=true ;;
+- no) mysql=false ;;
+- *) mysql=false ;;
+-esac],[mysql=false])
+-AM_CONDITIONAL(MYSQL, test x$mysql = xtrue)
+-
+-AC_ARG_ENABLE(pgresql,
+-[ --enable-pgresql include radlib postgreSQL database support],
+-[case "${enableval}" in
+- yes) pgresql=true ;;
+- no) pgresql=false ;;
+- *) pgresql=false ;;
+-esac],[pgresql=false])
+-AM_CONDITIONAL(PGRESQL, test x$pgresql = xtrue)
+-
+-AC_ARG_ENABLE(sqlite,
+-[ --enable-sqlite include radlib sqlite database support],
+-[case "${enableval}" in
+- yes) sqlite=true ;;
+- no) sqlite=false ;;
+- *) sqlite=false ;;
+-esac],[sqlite=false])
+-AM_CONDITIONAL(SQLITE, test x$sqlite = xtrue)
+-
+-# Check for big endian host:
+-AC_C_BIGENDIAN()
+-
+-# Checks for programs.
+-AC_PROG_CC
+-AC_PROG_INSTALL
+-AC_PROG_LIBTOOL
+-
+-# Set a flag here if we are cross compiling (must be after AC_PROG_CC)
+-AM_CONDITIONAL(CROSSCOMPILE, test x$cross_compiling = xyes)
+-
+-# Checks for libraries.
+-AC_CHECK_LIB([c], [strncpy])
+-AC_CHECK_LIB([m], [exp])
+-
+-# Checks for header files.
+-AC_HEADER_STDC
+-AC_HEADER_SYS_WAIT
+-AC_CHECK_HEADERS([fcntl.h \
+- stdlib.h \
+- string.h \
+- sys/time.h \
+- syslog.h \
+- termios.h \
+- unistd.h])
+-
+-# Checks for typedefs, structures, and compiler characteristics.
+-AC_C_CONST
+-AC_TYPE_PID_T
+-AC_HEADER_TIME
+-AC_STRUCT_TM
+-
+-# Checks for library functions.
+-AC_FUNC_FORK
+-AC_FUNC_MALLOC
+-AC_FUNC_SELECT_ARGTYPES
+-AC_TYPE_SIGNAL
+-AC_FUNC_STAT
+-AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS([getcwd \
+- gethostname \
+- gettimeofday \
+- memset \
+- mkdir \
+- mkfifo \
+- select \
+- strchr \
+- strerror \
+- strrchr])
+-
+-AC_CONFIG_FILES([Makefile \
+- src/Makefile \
+- msgRouter/Makefile \
+- debug/Makefile])
+-AC_OUTPUT
+-
+--
+2.4.3
+
--
2.4.11
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v3 3/3] package/radlib: reworked autotools with pkg-config
2016-04-06 12:21 [Buildroot] [PATCH v3 1/3] package/radlib: New package ray.kinsella at intel.com
2016-04-06 12:21 ` [Buildroot] [PATCH v3 2/3] package/radlib: Renamed configure.in to configure.ac ray.kinsella at intel.com
@ 2016-04-06 12:21 ` ray.kinsella at intel.com
1 sibling, 0 replies; 3+ messages in thread
From: ray.kinsella at intel.com @ 2016-04-06 12:21 UTC (permalink / raw)
To: buildroot
From: Ray Kinsella <ray.kinsella@intel.com>
Reworked the autools implementation to use pkg-config and mysql-config.
Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
---
...radlib-reworked-autotools-with-pkg-config.patch | 252 +++++++++++++++++++++
1 file changed, 252 insertions(+)
create mode 100644 package/radlib/0002-radlib-reworked-autotools-with-pkg-config.patch
diff --git a/package/radlib/0002-radlib-reworked-autotools-with-pkg-config.patch b/package/radlib/0002-radlib-reworked-autotools-with-pkg-config.patch
new file mode 100644
index 0000000..3410fcb
--- /dev/null
+++ b/package/radlib/0002-radlib-reworked-autotools-with-pkg-config.patch
@@ -0,0 +1,252 @@
+From 832855f6942fea66a39c738865484e57a8f97169 Mon Sep 17 00:00:00 2001
+From: Ray Kinsella <ray.kinsella@intel.com>
+Date: Wed, 6 Apr 2016 11:25:40 +0100
+Subject: [PATCH 2/2] radlib: reworked autotools with pkg-config
+
+Reworked the autools implementation to use pkg-config and mysql-config.
+
+Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
+---
+ configure.ac | 47 ++++++++++++++++++++++-------------------------
+ debug/Makefile.am | 32 +++++---------------------------
+ msgRouter/Makefile.am | 34 ++++++----------------------------
+ src/Makefile.am | 36 +++++++++++++-----------------------
+ 4 files changed, 46 insertions(+), 103 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 47e507e..ba493f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,35 +3,32 @@
+ AC_PREREQ(2.5)
+ AC_INIT([radlib],[2.12.0],[mteel2005 at gmail.com])
+ AC_CONFIG_SRCDIR([h/radmsgLog.h])
+-AM_INIT_AUTOMAKE([radlib],[2.12.0])
++AM_INIT_AUTOMAKE([subdir-objects])
+ AM_CONFIG_HEADER([config.h])
+
+-AC_ARG_ENABLE(mysql,
+-[ --enable-mysql include radlib MySQL database support],
+-[case "${enableval}" in
+- yes) mysql=true ;;
+- no) mysql=false ;;
+- *) mysql=false ;;
+-esac],[mysql=false])
+-AM_CONDITIONAL(MYSQL, test x$mysql = xtrue)
++AC_ARG_WITH([postgresql], AS_HELP_STRING([--with-postgresql], [Build with postgresql]))
++if test "x$with_postgresql" = "xyes"; then
++ PKG_CHECK_MODULES([POSTGRESQL], [libpq], [have_libpq=yes], [have_libpq=no])
++fi
++AM_CONDITIONAL([HAVE_POSTGRESQL], [test "$have_libpq" = "yes"])
+
+-AC_ARG_ENABLE(pgresql,
+-[ --enable-pgresql include radlib postgreSQL database support],
+-[case "${enableval}" in
+- yes) pgresql=true ;;
+- no) pgresql=false ;;
+- *) pgresql=false ;;
+-esac],[pgresql=false])
+-AM_CONDITIONAL(PGRESQL, test x$pgresql = xtrue)
++AC_ARG_WITH([mysql], AS_HELP_STRING([--with-mysql], [Build with mysql]))
++if test "x$with_mysql" = "xyes"; then
++ AC_PATH_PROG([MYSQL_CONFIG], [mysql_config])
++ if test "x$MYSQL_CONFIG" != "x";then
++ MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
++ MYSQL_LIBS=`$MYSQL_CONFIG --libs`
++ AC_SUBST([MYSQL_CFLAGS])
++ AC_SUBST([MYSQL_LIBS])
++ fi
++fi
++AM_CONDITIONAL([HAVE_MYSQL], [test "x$MYSQL_CONFIG" != "x"])
+
+-AC_ARG_ENABLE(sqlite,
+-[ --enable-sqlite include radlib sqlite database support],
+-[case "${enableval}" in
+- yes) sqlite=true ;;
+- no) sqlite=false ;;
+- *) sqlite=false ;;
+-esac],[sqlite=false])
+-AM_CONDITIONAL(SQLITE, test x$sqlite = xtrue)
++AC_ARG_WITH([sqlite], AS_HELP_STRING([--with-sqlite], [Build with sqlite]))
++if test "x$with_sqlite" = "xyes"; then
++ PKG_CHECK_MODULES([SQLITE3], [sqlite3], [have_libsqlite3=yes], [have_libsqlite3=no])
++fi
++AM_CONDITIONAL([HAVE_SQLITE3], [test "$have_libsqlite3" = "yes"])
+
+ # Check for big endian host:
+ AC_C_BIGENDIAN()
+diff --git a/debug/Makefile.am b/debug/Makefile.am
+index 00f3b13..fde57d5 100644
+--- a/debug/Makefile.am
++++ b/debug/Makefile.am
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = raddebug
+
+ # define include directories
+-INCLUDES = \
++AM_CFLAGS = \
+ -I$(top_srcdir)/h \
+ -D_GNU_SOURCE
+
+@@ -15,30 +15,8 @@ raddebug_SOURCES = \
+ # define libraries
+ raddebug_LDADD = -lrad -lpthread
+
+-if MYSQL
+-raddebug_LDADD += -lmysqlclient
+-else
+-if PGRESQL
+-raddebug_LDADD += -lpq
+-endif
+-endif
+-if SQLITE
+-raddebug_LDADD += -lsqlite3
+-endif
+-
+ # define library directories
+-raddebug_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
+-INCLUDES += -I$(prefix)/include -I/usr/include
+-
+-if MYSQL
+-raddebug_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
+-else
+-if PGRESQL
+-raddebug_LDFLAGS += -L$(prefix)/pgsql/lib
+-INCLUDES += -I$(prefix)/pgsql/include
+-endif
+-endif
+-
+-if CROSSCOMPILE
+-raddebug_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+-endif
++raddebug_LDFLAGS = -L../src/.libs \
++ $(SQLITE3_LIBS) \
++ $(MYSQL_LIBS) \
++ $(POSTGRESQL_LIBS)
+diff --git a/msgRouter/Makefile.am b/msgRouter/Makefile.am
+index 5a20421..6f13a4e 100644
+--- a/msgRouter/Makefile.am
++++ b/msgRouter/Makefile.am
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = radmrouted
+
+ # define include directories
+-INCLUDES = \
++AM_CFLAGS = \
+ -I$(top_srcdir)/h \
+ -D_GNU_SOURCE
+
+@@ -13,32 +13,10 @@ radmrouted_SOURCES = \
+ $(top_srcdir)/msgRouter/msgRouter.c
+
+ # define libraries
+-radmrouted_LDADD = -lrad -lpthread
+-
+-if MYSQL
+-radmrouted_LDADD += -lmysqlclient
+-else
+-if PGRESQL
+-radmrouted_LDADD += -lpq
+-endif
+-endif
+-if SQLITE
+-radmrouted_LDADD += -lsqlite3
+-endif
++radmrouted_LDADD = -lrad -lpthread
+
+ # define library directories
+-radmrouted_LDFLAGS = -L../src/.libs -L$(prefix)/lib -L/usr/lib
+-INCLUDES += -I$(prefix)/include -I/usr/include
+-
+-if MYSQL
+-radmrouted_LDFLAGS += -L$(prefix)/lib64/mysql -L$(prefix)/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql
+-else
+-if PGRESQL
+-radmrouted_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib
+-INCLUDES += -I$(prefix)/pgsql/include
+-endif
+-endif
+-
+-if CROSSCOMPILE
+-radmrouted_LDFLAGS += $(prefix)/lib/crt1.o $(prefix)/lib/crti.o $(prefix)/lib/crtn.o
+-endif
++radmrouted_LDFLAGS = -L../src/.libs \
++ $(SQLITE3_LIBS) \
++ $(MYSQL_LIBS) \
++ $(POSTGRESQL_LIBS)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 38b2ac8..25d16cf 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,45 +12,35 @@ SUBDIRS =
+ #define the library to be built
+ lib_LTLIBRARIES = librad.la
+
+-if MYSQL
+-MY_INCLUDES = \
+- -I$(prefix)/include/mysql \
+- -I/usr/include/mysql
+-MY_SOURCES = \
++if HAVE_MYSQL
++MYSQL_SOURCES = \
+ $(top_srcdir)/database/mysql/my_database.c \
+ $(top_srcdir)/src/raddatabase.c
+ MYSQL_HDRS = \
+ $(top_srcdir)/h/raddatabase.h
+ endif
+-if PGRESQL
+-PG_INCLUDES = \
+- -I$(prefix)/include \
+- -I/usr/include
+-PG_SOURCES = \
++if HAVE_POSTGRESQL
++PGSQL_SOURCES = \
+ $(top_srcdir)/database/postgresql/pg_database.c \
+ $(top_srcdir)/src/raddatabase.c
+ PGSQL_HDRS = \
+ $(top_srcdir)/h/raddatabase.h \
+ $(top_srcdir)/database/postgresql/_pg-types.h
+ endif
+-if SQLITE
+-SQ_INCLUDES = \
+- -I$(prefix)/include \
+- -I/usr/include
+-SQ_SOURCES = \
++if HAVE_SQLITE3
++SQLITE_SOURCES = \
+ $(top_srcdir)/src/radsqlite.c
+ SQLITE_HDRS = \
+ $(top_srcdir)/h/radsqlite.h
+ endif
+
+ # define include directories
+-INCLUDES = \
++AM_CFLAGS = \
+ -I$(top_srcdir)/h \
+- -I$(prefix)/include \
+ -D_GNU_SOURCE \
+- $(MY_INCLUDES) \
+- $(PG_INCLUDES) \
+- $(SQ_INCLUDES)
++ $(MYSQL_CFLAGS) \
++ $(SQLITE3_CFLAGS) \
++ $(POSTGRESQL_CFLAGS)
+
+
+
+@@ -86,9 +76,9 @@ librad_la_SOURCES = \
+ $(top_srcdir)/src/radtimers.c \
+ $(top_srcdir)/src/radtimeUtils.c \
+ $(top_srcdir)/src/radUDPsocket.c \
+- $(MY_SOURCES) \
+- $(PG_SOURCES) \
+- $(SQ_SOURCES)
++ $(MYSQL_SOURCES) \
++ $(PGSQL_SOURCES) \
++ $(SQLITE_SOURCES)
+
+
+ # define the header files we install for the library
+--
+2.4.3
+
--
2.4.11
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-06 12:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-06 12:21 [Buildroot] [PATCH v3 1/3] package/radlib: New package ray.kinsella at intel.com
2016-04-06 12:21 ` [Buildroot] [PATCH v3 2/3] package/radlib: Renamed configure.in to configure.ac ray.kinsella at intel.com
2016-04-06 12:21 ` [Buildroot] [PATCH v3 3/3] package/radlib: reworked autotools with pkg-config ray.kinsella at intel.com
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.