jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c5fc0dae0c7ac153d764dd284adb3d42a0bee5c8
commit c5fc0dae0c7ac153d764dd284adb3d42a0bee5c8 Author: Vincent Torri <[email protected]> Date: Sat Jun 11 08:41:21 2016 +0200 Elm: fix elementary quicklaunch build on Solaris --- configure.ac | 4 +++- pc/elementary.pc.in | 2 +- src/Makefile_Elementary.am | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f37f3a5..9b220f5 100644 --- a/configure.ac +++ b/configure.ac @@ -5479,7 +5479,7 @@ case "$host_os" in AC_CHECK_LIB([socket], [connect], [ have_socket="yes" - requirement_elm_libs="-lsocket ${requirement_elm_libs}" + requirements_libs_elm="-lsocket ${requirements_libs_elm}" ], [have_socket="no"]) ;; @@ -5491,6 +5491,8 @@ case "$host_os" in ;; esac +AC_SUBST([requirements_libs_elm]) + AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) # Check if we can build binary with quicklaunch support diff --git a/pc/elementary.pc.in b/pc/elementary.pc.in index 755947b..3f4967f 100644 --- a/pc/elementary.pc.in +++ b/pc/elementary.pc.in @@ -16,5 +16,5 @@ Name: elementary Description: Enlightenment Widgets library Requires.private: @requirements_pc_elementary@ Version: @VERSION@ -Libs: -L${libdir} -lelementary -lefl -leina -lpthread -leet -levas -lecore -lecore_evas -lecore_file -lecore_input -ledje -leo -lethumb_client -lemotion -lecore_imf -lecore_con -leldbus -lefreet -lefreet_mime -lefreet_trash -leio @requirements_public_libs_elementary@ @requirements_public_libs_eina@ @requirements_libs_eina@ +Libs: -L${libdir} -lelementary -lefl -leina -lpthread -leet -levas -lecore -lecore_evas -lecore_file -lecore_input -ledje -leo -lethumb_client -lemotion -lecore_imf -lecore_con -leldbus -lefreet -lefreet_mime -lefreet_trash -leio @requirements_public_libs_elementary@ @requirements_public_libs_eina@ @requirements_libs_eina@ @requirements_libs_elm@ Cflags: -I${includedir}/elementary-@VMAJ@ diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index dec763f..bb56351 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -925,7 +925,7 @@ endif if BUILD_QUICKLAUNCH bin_elementary_elementary_quicklaunch_SOURCES = bin/elementary/quicklaunch.c -bin_elementary_elementary_quicklaunch_LDADD = @USE_ELEMENTARY_LIBS@ +bin_elementary_elementary_quicklaunch_LDADD = @USE_ELEMENTARY_LIBS@ @requirements_libs_elm@ bin_elementary_elementary_quicklaunch_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@ bin_elementary_elementary_quicklaunch_CPPFLAGS = \ -I$(top_srcdir) \ @@ -947,7 +947,7 @@ bin_elementary_elementary_run_CPPFLAGS = -I$(top_srcdir) \ -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" bin_elementary_elementary_run_SOURCES = bin/elementary/run.c -bin_elementary_elementary_run_LDADD = +bin_elementary_elementary_run_LDADD = @requirements_libs_elm@ bin_elementary_elementary_run_LDFLAGS = endif endif --
