Skip to content
Permalink
Branch: master
Find file Copy path
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
47 lines (41 sloc) 1.67 KB
diff --git src/configure.ac src/configure.ac
index a3c5992..9b6b0bd 100644
--- src/configure.ac
+++ src/configure.ac
@@ -79,7 +79,9 @@ fi
PKG_CHECK_MODULES([OMNIORB], [omniORB4 >= 4.0.0])
-OMNIORB_INCLUDEDIR=`pkg-config --variable=includedir omniORB4`
+if test x"$OMNIORB_INCLUDEDIR" = x ; then
+ OMNIORB_INCLUDEDIR=`pkg-config --variable=includedir omniORB4`
+fi
AC_SUBST(OMNIORB_INCLUDEDIR)
PKG_CHECK_EXISTS([omniORB4 >= 4.2.0],[AC_DEFINE([OMNIORB4_2],[1],[])])
PKG_CHECK_MODULES([OMNITHREAD], [omnithread3 >= 4.0.0])
PKG_CHECK_MODULES([OMNIDYNAMIC], [omniDynamic4 >= 4.0.0])
@@ -90,7 +92,9 @@ PKG_CHECK_EXISTS([omniCOS4 >= 4.0.0], [libomnicos_exist=yes], [libomnicos_exist=
dnl Use PKG_CHECK_MODULES to declare the CFLAGS and LIBS varible
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES([OMNICOS], [omniCOS4 >= 4.0.0])
-OMNICOS_IDLDIR=`pkg-config --variable=idldir omniCOS4`
+if test x"$OMNICOS_IDLDIR" = x ; then
+ OMNICOS_IDLDIR=`pkg-config --variable=idldir omniCOS4`
+fi
AC_SUBST(OMNICOS_IDLDIR)
AC_DEFINE(ENABLE_EVENTS, 1, [Define if events are enabled])
@@ -103,7 +107,9 @@ if test "$IDL" = no; then
fi
AC_MSG_CHECKING([for default IDL path])
-idldir=`pkg-config --variable=idldir omniORB4`
+if test x"$idldir" = x ; then
+ idldir=`pkg-config --variable=idldir omniORB4`
+fi
AC_MSG_RESULT([$idldir])
AC_SUBST(IDLDIR, [$idldir])
@@ -273,7 +277,7 @@
# C++ unit testing support. May want to conditionally enable/disable this.
-AM_PATH_CPPUNIT(1.12.1)
+ifdef([AM_PATH_CPPUNIT], [AM_PATH_CPPUNIT([1.12.1])], [])
AS_IF([test "x$HAVE_JAVASUPPORT" == "xyes"], [
dnl Use RPM location hard-coded for now
AC_SUBST([JUNIT_CLASSPATH], "/usr/share/java/junit4.jar")
])
You can’t perform that action at this time.