mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Added --with-edelib-path option to specify alternative edelib installation

Browse Source
This commit is contained in:
Sanel Zukan 2009-04-10 16:03:00 +00:00
parent d1d65a8131
commit 225855ac92
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.in
View File

@ -28,7 +28,6 @@ else
fi fi
AC_DEFINE_UNQUOTED(PREFIX, "$EDE_INSTALL_DIR", [Default installation place]) AC_DEFINE_UNQUOTED(PREFIX, "$EDE_INSTALL_DIR", [Default installation place])
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/ede/lib/pkgconfig"
EDE_OPTIM_FLAGS="" EDE_OPTIM_FLAGS=""
EDE_DEBUG_FLAGS="" EDE_DEBUG_FLAGS=""
@ -43,6 +42,8 @@ dnl set 'with_fltk_path'
AC_ARG_WITH(fltk_path, AC_HELP_STRING([--with-fltk-path=[DIR]], [alternative directory where FLTK is installed])) AC_ARG_WITH(fltk_path, AC_HELP_STRING([--with-fltk-path=[DIR]], [alternative directory where FLTK is installed]))
dnl set 'with_efltk_path' dnl set 'with_efltk_path'
AC_ARG_WITH(efltk_path, AC_HELP_STRING([--with-efltk-path=[DIR]], [alternative directory where eFLTK is installed])) AC_ARG_WITH(efltk_path, AC_HELP_STRING([--with-efltk-path=[DIR]], [alternative directory where eFLTK is installed]))
dnl set 'with_edelib_path'
AC_ARG_WITH(edelib_path, AC_HELP_STRING([--with-edelib-path=[DIR]], [alternative directory where edelib is installed]))
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CPP AC_PROG_CPP
@ -107,6 +108,13 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
if test -n "$with_edelib_path"; then
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$with_edelib_path"
else
dnl TODO: remove this in release
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/ede/lib/pkgconfig"
fi
PKG_CHECK_MODULES(EDELIB, [edelib],, [have_edelib=no]) PKG_CHECK_MODULES(EDELIB, [edelib],, [have_edelib=no])
if test "$have_edelib" = "no"; then if test "$have_edelib" = "no"; then
AC_MSG_ERROR(edelib not found! You must install it first) AC_MSG_ERROR(edelib not found! You must install it first)