From 9c1c167ce5af95df522f0ded893feddf288d29dd Mon Sep 17 00:00:00 2001 From: "Andrew T. Veliath" Date: Fri, 13 Nov 1998 04:22:02 +0000 Subject: [PATCH] Remove HAVE_ORBIT, HAVE_MICO_ORB_RUN. HAVE_ORBIT is now implicit. 1998-11-12 Andrew T. Veliath * acconfig.h: Remove HAVE_ORBIT, HAVE_MICO_ORB_RUN. HAVE_ORBIT is now implicit. * Makefile.am: Remove ORBIT_INSTALLED AM_CONDITIONAL. * configure.in: The ORBit AM_CONDITIONAL is now in gnome-orbit-check.m4 as HAVE_ORBIT. --- Makefile.am | 2 -- acconfig.h | 2 -- configure.in | 6 ------ 3 files changed, 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6e8ca6f5b..81afaac6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,8 @@ -if ORBIT_INSTALLED control_center = control-center capplets = capplets panel = panel applets = applets idl = idl -endif always_built_SUBDIRS = \ gsm smproxy pixmaps desktop-links desktop-properties help-browser \ diff --git a/acconfig.h b/acconfig.h index 8665669af..a6ed95cdc 100644 --- a/acconfig.h +++ b/acconfig.h @@ -7,8 +7,6 @@ #undef HAVE_LIBSM #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME #undef HAVE_PROGRAM_INVOCATION_NAME -#undef HAVE_ORBIT -#undef HAVE_MICO_ORB_RUN #undef PACKAGE #undef VERSION diff --git a/configure.in b/configure.in index c9421760b..8af759eb7 100644 --- a/configure.in +++ b/configure.in @@ -60,12 +60,6 @@ for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do fi done -dnl -dnl ORBit checks -dnl -GNOME_ORBIT_HOOK([have_orbit=true],[]) -AM_CONDITIONAL(ORBIT_INSTALLED, test x$have_orbit = xtrue) - ORB_LIBS="$ORBIT_LIBS" ORB_CFLAGS="$ORBIT_CFLAGS"