mirror
/
ede
mirror of https://github.com/edeproject/ede.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Addopted to recent changes in edelib-gui*.pc files

This commit is contained in:
Sanel Zukan 2011-11-21 14:09:18 +00:00
parent 971dd60f51
commit e12c43e404
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jamconfig.in
View File

@ -93,12 +93,14 @@ LIBM ?= -lm ;
#REMOVE_UNUSED_DEPENDENCIES_TRICK = 1 ;
# edelib libraries path
EDELIBINCLUDE ?= @EDELIB_CFLAGS@ ;
EDELIBLIB ?= @EDELIB_LIBS@ ;
EDELIB_GUI_INCLUDE ?= @EDELIB_GUI_CFLAGS@ ;
EDELIB_GUI_LIB ?= @EDELIB_GUI_LIBS@ ;
EDELIB_DBUS_INCLUDE ?= @EDELIB_DBUS_CFLAGS@ ;
EDELIB_DBUS_LIB ?= @EDELIB_DBUS_LIBS@ ;
EDELIBINCLUDE ?= @EDELIB_CFLAGS@ ;
EDELIBLIB ?= @EDELIB_LIBS@ ;
EDELIB_GUI_INCLUDE ?= @EDELIB_GUI_CFLAGS@ ;
EDELIB_GUI_LIB ?= @EDELIB_GUI_LIBS@ ;
EDELIB_GUI_NO_IMAGES_INCLUDE ?= @EDELIB_GUI_NO_IMAGES_CFLAGS@ ;
EDELIB_GUI_NO_IMAGES_LIB ?= @EDELIB_GUI_NO_IMAGES_LIBS@ ;
EDELIB_DBUS_INCLUDE ?= @EDELIB_DBUS_CFLAGS@ ;
EDELIB_DBUS_LIB ?= @EDELIB_DBUS_LIBS@ ;
# fltk libraries path
FLTKINCLUDE ?= @FLTK_CFLAGS@ ;

16
build/Program.jam
View File

@ -72,8 +72,8 @@ rule Program
}
# EdeProgram [target] : [sources] : [noinstall] ;
# Creates EDE specific programs. They will be linked with EDELIBLIB
# and FLTKLIB. If [noinstall] is given, [target] will not be installed wit 'jam install'.
# Creates EDE specific programs. They will be linked with EDELIB_GUI_LIB.
# If [noinstall] is given, [target] will not be installed wit 'jam install'.
rule EdeProgram
{
if ! $(EDELIBLIB) {
@ -82,8 +82,8 @@ rule EdeProgram
}
MakeProgramPrivate $(1) : $(2)
: $(EDELIB_GUI_LIB) $(EDELIBLIB) $(FLTKLIB) $(STDLIB)
: $(GLOBALFLAGS) $(EDELIBINCLUDE) $(FLTKINCLUDE) ;
: $(EDELIB_GUI_LIB) $(STDLIB)
: $(GLOBALFLAGS) $(EDELIB_GUI_INCLUDE) ;
if $(3) != "noinstall" {
InstallEdeProgram $(1) ;
@ -91,8 +91,8 @@ rule EdeProgram
}
# EdeProgramAsFltkBare [target] : [sources] : [noinstall] ;
# Creates EDE specific programs. They will be linked with EDELIBLIB
# and FLTKLIB. If [noinstall] is given, [target] will not be installed wit 'jam install'.
# Creates EDE specific programs. They will be linked with EDELIB_GUI_NO_IMAGES_LIB
# If [noinstall] is given, [target] will not be installed wit 'jam install'.
rule EdeProgramAsFltkBare
{
if ! $(EDELIBLIB) {
@ -101,8 +101,8 @@ rule EdeProgramAsFltkBare
}
MakeProgramPrivate $(1) : $(2)
: $(EDELIB_GUI_LIB) $(EDELIBLIB) $(FLTKLIB_NOIMAGES) $(STDLIB)
: $(GLOBALFLAGS) $(EDELIBINCLUDE) $(FLTKINCLUDE) ;
: $(EDELIB_GUI_NO_IMAGES_LIB) $(STDLIB)
: $(GLOBALFLAGS) $(EDELIB_GUI_NO_IMAGES_INCLUDE) ;
if $(3) != "noinstall" {
InstallEdeProgram $(1) ;

5
configure.in
View File

@ -122,6 +122,11 @@ if test "$have_edelib_gui" = "no"; then
AC_MSG_ERROR(edelib-gui not found! You must install it first)
fi
PKG_CHECK_MODULES(EDELIB_GUI_NO_IMAGES, [edelib-gui-no-images],, [have_edelib_gui_no_images=no])
if test "$have_edelib_gui_no_images" = "no"; then
AC_MSG_ERROR(edelib-gui (without images) not found! You must install it first)
fi
PKG_CHECK_MODULES(EDELIB_DBUS, [edelib-dbus],, [have_edelib_dbus=no])
if test "$have_edelib_dbus" = "no"; then
AC_MSG_ERROR(edelib-dbus not found! You must install it first)