From 87e7d4b5d71b6e97937eaa4e81e5dd4bd4d18319 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 20 Apr 2009 04:48:58 +0000 Subject: [PATCH] allow the build of elementary_run on opensolaris SVN revision: 40245 --- legacy/elementary/configure.in | 8 ++++++++ legacy/elementary/src/bin/Makefile.am | 2 ++ 2 files changed, 10 insertions(+) diff --git a/legacy/elementary/configure.in b/legacy/elementary/configure.in index 6089531bbb..15f1d6ff26 100644 --- a/legacy/elementary/configure.in +++ b/legacy/elementary/configure.in @@ -51,6 +51,7 @@ case "$host_os" in dnl managed by evil AC_DEFINE(HAVE_DLADDR) requirement_elm="evil" + have_socket="no" ;; mingw*) PKG_CHECK_MODULES([EVIL], [evil]) @@ -59,6 +60,11 @@ dnl managed by evil ELM_WIN32_DEF="#define" have_windows="yes" requirement_elm="evil" + have_socket="no" + ;; + *solaris*) + have_socket="yes" + AC_CHECK_LIB([socket], [connect], [], [have_socket="no"]) ;; *) ELM_UNIX_DEF="#define" @@ -74,8 +80,10 @@ dnl managed by evil AC_MSG_ERROR(Cannot find dlopen) fi fi + have_socket="yes" ;; esac +AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) have_fork="no" AC_CHECK_FUNCS(fork, [ diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am index af79791779..31096ecf98 100644 --- a/legacy/elementary/src/bin/Makefile.am +++ b/legacy/elementary/src/bin/Makefile.am @@ -33,9 +33,11 @@ elementary_quicklaunch_SOURCES = quicklaunch.c elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la elementary_quicklaunch_LDFLAGS = +if BUILD_RUN elementary_run_SOURCES = run.c elementary_run_LDADD = elementary_run_LDFLAGS = +endif ## This is how to build a quicklanch capable app # build the shared lib version - libtool produces a .a and .la file as well