From 225855ac92aeff92f7316ad62071d2009191ed15 Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Fri, 10 Apr 2009 16:03:00 +0000 Subject: [PATCH] Added --with-edelib-path option to specify alternative edelib installation --- configure.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index f73543b..d59e2d3 100644 --- a/configure.in +++ b/configure.in @@ -28,7 +28,6 @@ else fi AC_DEFINE_UNQUOTED(PREFIX, "$EDE_INSTALL_DIR", [Default installation place]) -PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/ede/lib/pkgconfig" EDE_OPTIM_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])) dnl set 'with_efltk_path' 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_CPP @@ -107,6 +108,13 @@ else AC_MSG_RESULT(no) 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]) if test "$have_edelib" = "no"; then AC_MSG_ERROR(edelib not found! You must install it first)