diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | eglib/Makefile.am | 8 | ||||
| -rw-r--r-- | eglib/glib.h | 0 |
5 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index c30d3596..e67c171c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = common sdpd hcid daemon \ +SUBDIRS = eglib common sdpd hcid daemon \ transfer network serial input audio sync \ tools rfcomm dund pand hidd \ cups alsa test scripts diff --git a/acinclude.m4 b/acinclude.m4 index 54fa7902..8abd3d29 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -269,12 +269,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [ fi if (test "${glib_enable}" = "yes" && test "${glib_found}" = "yes"); then - AC_DEFINE(HAVE_GLIB, 1, [Define to 1 if you have GLib support.]) if (test "${dbus_glib_found}" = "yes"); then AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define to 1 if you have D-Bus GLib bindings.]) DBUS_CFLAGS="$DBUS_CFLAGS $DBUS_GLIB_CFLAGS" DBUS_LIBS="$DBUS_GLIB_LIBS" fi + else + AC_SUBST([GLIB_CFLAGS], ['-I$(top_srcdir)/eglib']) + AC_SUBST([GLIB_LIBS], ['-L$(top_builddir)/eglib -leglib']) fi AM_CONDITIONAL(INOTIFY, test "${inotify_enable}" = "yes" && test "${inotify_found}" = "yes") diff --git a/configure.in b/configure.in index d85682c1..b38ece0a 100644 --- a/configure.in +++ b/configure.in @@ -36,4 +36,4 @@ AC_PATH_INOTIFY AC_ARG_BLUEZ -AC_OUTPUT(Makefile common/Makefile daemon/Makefile transfer/Makefile network/Makefile serial/Makefile input/Makefile audio/Makefile sync/Makefile tools/Makefile rfcomm/Makefile hcid/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile alsa/Makefile test/Makefile scripts/Makefile) +AC_OUTPUT(Makefile eglib/Makefile common/Makefile daemon/Makefile transfer/Makefile network/Makefile serial/Makefile input/Makefile audio/Makefile sync/Makefile tools/Makefile rfcomm/Makefile hcid/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile alsa/Makefile test/Makefile scripts/Makefile) diff --git a/eglib/Makefile.am b/eglib/Makefile.am new file mode 100644 index 00000000..4d41ad92 --- /dev/null +++ b/eglib/Makefile.am @@ -0,0 +1,8 @@ + +if !GLIB +noinst_LTLIBRARIES = libeglib.la + +libeglib_la_SOURCES = glib.h +endif + +MAINTAINERCLEANFILES = Makefile.in diff --git a/eglib/glib.h b/eglib/glib.h new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/eglib/glib.h |