summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-09-27 17:49:17 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-09-27 17:49:17 +0000
commit127649091e7b86769e8b16276d52c86795de2416 (patch)
tree1e4797a06724645fa6d443c60081071c1be1abdd
parent96169423e79f25b6d8e653bd467e9e140264665c (diff)
downloadgconf-127649091e7b86769e8b16276d52c86795de2416.tar.gz
look for orbit-idl-2 using pkg-config
2001-09-27 Havoc Pennington <hp@redhat.com> * configure.in (ORBIT_IDL): look for orbit-idl-2 using pkg-config
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cd7206a1..407a5daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27 Havoc Pennington <hp@redhat.com>
+
+ * configure.in (ORBIT_IDL): look for orbit-idl-2 using pkg-config
+
2001-09-17 Havoc Pennington <hp@redhat.com>
* configure.in: look for orbit-idl-2 not orbit-idl,
diff --git a/configure.in b/configure.in
index fbc62e23..9b2fc873 100644
--- a/configure.in
+++ b/configure.in
@@ -156,13 +156,9 @@ AM_CONDITIONAL(BDB, test -n "$BDB_LIBS")
AC_SUBST(BDB_LIBS)
AC_SUBST(BDB_CFLAGS)
-AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, no)
+ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
AC_SUBST(ORBIT_IDL)
-if test x$ORBIT_IDL = xno; then
- AC_MSG_ERROR([Could not find orbit-idl-2 in your path, should come with ORBit2])
-fi
-
AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt,
[AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[
*** Couldn't find popt. Please download and install from