LADI
/
gabriel
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Makefile.am: 

* configure.ac:
  Remove the server-side stuff from build.


git-svn-id: https://gabriel.svn.sourceforge.net/svnroot/gabriel@14 841437c2-2226-0410-8ced-e7c76d862a31
This commit is contained in:
zeenix 2007-01-29 13:05:08 +00:00
parent 41acd25dbe
commit 331b4c1e17
3 changed files with 18 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-29 Zeeshan Ali <zeenix@gstreamer.net>
* Makefile.am:
* configure.ac:
Remove the server-side stuff from build.
2007-01-29 Zeeshan Ali <zeenix@gstreamer.net>
* client/Makefile.am:

14
Makefile.am
View File

@ -1,16 +1,4 @@
if BUILD_CLIENT
CLIENT_SUBDIR = client
else
CLIENT_SUBDIR =
endif
if BUILD_SERVER
SERVER_SUBDIR = server
else
SERVER_SUBDIR =
endif
SUBDIRS = $(CLIENT_SUBDIR) $(SERVER_SUBDIR)
SUBDIRS = src
MAINTAINERCLEANFILES = Makefile.in configure

39
configure.ac
View File

@ -20,29 +20,29 @@ dnl
dnl Process this file with autoconf to produce a configure script.
AC_INIT([Gabriel], [0.1], [zeenix@gstreamer.net], [gabriel])
AC_PREREQ([2.60])
AC_CONFIG_SRCDIR([client/gabriel-main.c])
AC_CONFIG_SRCDIR([src/gabriel-main.c])
AM_INIT_AUTOMAKE
dnl Checks for programs.
AC_PROG_CC
dnl Check for client side dependencies
dnl Check for dependencies
dnl Check for libssh
AC_CHECK_LIB(ssh, ssh_new,
build_client="yes",
AC_MSG_WARN("Can't find libssh. Gabriel client shall not be built.")
build_client="no")
build_gabriel="yes",
AC_MSG_ERROR("cannot find libssh. Gabriel shall not be built.")
build_gabriel="no")
if test "x$build_client" = "xyes"; then
if test "x$build_gabriel" = "xyes"; then
dnl Check for glib2
PKG_CHECK_MODULES(GLIB2,glib-2.0 >= 2.10,HAVE_GLIB2=yes,HAVE_GLIB2=no)
AC_SUBST(GLIB2_LIBS)
AC_SUBST(GLIB2_CFLAGS)
if test "x$HAVE_GLIB2" = "xno"; then
AC_MSG_WARN([Can't find Glib2. Gabriel client shall not be built.])
build_client="no"
AC_MSG_ERROR([cannot find Glib2. Gabriel shall not be built.])
build_gabriel="no"
fi
dnl Check for D-Bus
@ -51,27 +51,11 @@ if test "x$build_client" = "xyes"; then
AC_SUBST(DBUS_CFLAGS)
if test "x$HAVE_DBUS" = "xno"; then
AC_MSG_WARN([Can't find D-Bus. Gabriel client shall not be built.])
build_client="no"
AC_MSG_ERROR([cannot find D-Bus. Gabriel shall not be built.])
build_gabriel="no"
fi
fi
AM_CONDITIONAL([BUILD_CLIENT], [test x$build_client = xyes])
dnl Check for server side dependencies now
AC_CHECK_PROG([have_socat], [socat], yes, no)
if [test x$have_socat == xyes]; then
AC_CHECK_PROG([have_dbus_daemon], [dbus-daemon], yes, no)
if [test x$have_dbus_daemon == xno]; then
AC_MSG_WARN([Can't find dbus-daemon. Gabriel server shall not be built.])
fi
else
AC_MSG_WARN([Can't find socat, Gabriel server shall not be built.])
fi
AM_CONDITIONAL([BUILD_SERVER],
[test x$have_socat == xyes -a x$have_dbus_daemon == xyes])
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h)
@ -81,8 +65,7 @@ AC_C_CONST
dnl Done.
AC_CONFIG_FILES([Makefile
client/Makefile
server/Makefile
src/Makefile
])
AC_OUTPUT