kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Elm: fix elementary quicklaunch build on Solaris

This commit is contained in:
Vincent Torri 2016-06-11 08:41:21 +02:00 committed by Jean-Philippe Andre
parent e5884c95fa
commit c5fc0dae0c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -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

2
pc/elementary.pc.in
View File

@ -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@

4
src/Makefile_Elementary.am
View File

@ -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