diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-20 03:14:41 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-20 03:14:41 +0000 |
| commit | 49476c7cd350f32732c6083160675f86773b6766 (patch) | |
| tree | cb19f75d06228f6064793c6a74779b84162dc3d5 /pki/base/console | |
| parent | 6169ee60eade7c6b7dee3cd4d7b71dfdb7e85c06 (diff) | |
| download | pki-49476c7cd350f32732c6083160675f86773b6766.tar.gz pki-49476c7cd350f32732c6083160675f86773b6766.tar.xz pki-49476c7cd350f32732c6083160675f86773b6766.zip | |
Build changes made in preparation for automated nightly builds; no official source tarballs were released for any spec files included in this check-in.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1757 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/console')
| -rw-r--r-- | pki/base/console/build.xml | 2 | ||||
| -rw-r--r-- | pki/base/console/src/CMakeLists.txt | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pki/base/console/build.xml b/pki/base/console/build.xml index 5a7257d3..e657126a 100644 --- a/pki/base/console/build.xml +++ b/pki/base/console/build.xml @@ -22,6 +22,7 @@ <property name="jss.home" value="${jni-jar.home}${dirsec}"/> <property name="jss.jar" value="${jss.home}/jss4.jar"/> + <property name="osutil.jar" value="${jni-jar.home}/osutil.jar"/> <property name="ldapjdk.jar" value="${jar.home}/ldapjdk.jar"/> <property name="base.jar" value="${jar.home}/idm-console-base.jar"/> <property name="mcc.jar" value="${jar.home}/idm-console-mcc.jar"/> @@ -32,6 +33,7 @@ <path id="classpath"> <pathelement location="${jss.jar}"/> + <pathelement location="${osutil.jar}"/> <pathelement location="${ldapjdk.jar}"/> <pathelement location="${pki-nsutil.jar}"/> <pathelement location="${base.jar}"/> diff --git a/pki/base/console/src/CMakeLists.txt b/pki/base/console/src/CMakeLists.txt index c4e9c3c3..ec58e9dc 100644 --- a/pki/base/console/src/CMakeLists.txt +++ b/pki/base/console/src/CMakeLists.txt @@ -69,6 +69,14 @@ find_file(JSS_JAR /usr/share/java ) +find_file(OSUTIL_JAR + NAMES + osutil.jar + PATHS + /usr/lib/java + /usr/share/java +) + # identify java sources set(pki-console_java_SRCS @@ -598,7 +606,8 @@ set(CMAKE_JAVA_INCLUDE_PATH ${BASE_JAR} ${LDAPJDK_JAR} ${MMC_JAR} ${MMC_EN_JAR} ${NMCLF_JAR} ${NMCLF_EN_JAR} ${PKI_NSUTIL_JAR} - ${JSS_JAR}) + ${JSS_JAR} + ${OSUTIL_JAR}) # set version |