Use STD_DEFINES' rather than STD_CPP_DEFINES'. (ORB_LIBS): To replace

* configure.in (SMPROXY_DEFS): Use `STD_DEFINES' rather than
`STD_CPP_DEFINES'.
(ORB_LIBS): To replace MICO_LIBS.
(ORBIT_LIBS,MICO_LIBS): Don't subst.
(ORBIT_CONFIG): Don't use `if [ .. ];', use `if test ..;'.

* */Makefile.am: s/MICO_LIBS/ORB_LIBS/g.
* panel/appletsConf.sh.h: Likewise.

Note:
Automake seems to generate buggy Makefiles for

	if FOO
	BAR = a \
		b \
		c
	endif

I'll verify this and submit the test-case.

ChangeLog

@@ -1,3 +1,11 @@
+1998-07-19  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* configure.in (SMPROXY_DEFS): Use `STD_DEFINES' rather than
+	`STD_CPP_DEFINES'. 
+	(ORB_LIBS): To replace MICO_LIBS.
+	(ORBIT_LIBS,MICO_LIBS): Don't subst.
+	(ORBIT_CONFIG): Don't use `if [ .. ];', use `if test ..;'.
+	
 1998-07-18  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* configure.in (SMPROXY_DEFS): New check, based on AC_PATH_X11.

configure.in

@@ -37,19 +37,6 @@ AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
-for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
-  if test -f $dir/orbit-idl ; then
-     orbit_prefix=`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'`
-     break
-  fi
-done
-AC_CHECK_PROG(ORBIT_CONFIG, orbit-config, orbit-config)
-if [ ! -z "$ORBIT_CONFIG" ]; then
-	ORBIT_LIBS="`orbit-config --libs client server`"
-	ORBIT_CFLAGS="`orbit-config --cflags client server`"
-fi
-AC_SUBST(ORBIT_LIBS)
-AM_CONDITIONAL(ORBIT_INSTALLED, test ! -z "$ORBIT_LIBS")
 
 AC_CHECK_HEADERS(dlfcn.h dl.h)
 AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl",[
@@ -64,10 +51,28 @@ dnl properties-keyboard
 AC_CHECK_HEADERS(X11/extensions/xf86misc.h, XF86MISC_LIBS="-lXxf86misc")
 AC_SUBST(XF86MISC_LIBS)
 
+for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
+  if test -f $dir/orbit-idl ; then
+     orbit_prefix=`echo $dir | sed 's%/bin$%%' |sed 's%/bin/$%%'`
+     break
+  fi
+done
+AC_CHECK_PROG(ORBIT_CONFIG, orbit-config, orbit-config)
+if test -n "$ORBIT_CONFIG"; then
+	ORBIT_LIBS="`orbit-config --libs client server`"
+	ORBIT_CFLAGS="`orbit-config --cflags client server`"
+fi
+AC_SUBST(ORBIT_CFLAGS)
+AC_SUBST(ORBIT_LIBS)
+AM_CONDITIONAL(ORBIT_INSTALLED, test -n "$ORBIT_LIBS")
+
+ORB_LIBS="$ORBIT_LIBS"
+ORB_CFLAGS="$ORBIT_CFLAGS"
+
 dnl MICO - Magic to extract the relevant information from
 dnl        various installed files
-
+MICO_LIBS= MICO_CFLAGS=
-if test -z "$ORBIT_LIBS"; then
+if test -z "$ORB_LIBS"; then
   AC_MSG_CHECKING(for MICO prefix)
   for dir in `(IFS=:; for i in $PATH; do echo $i ; done)` ; do
     if test -f $dir/mico-ld ; then
@@ -119,12 +124,11 @@ for flag in `grep '^eval' < $mico_prefix/bin/mico-ld | sed s%\"%%g` ; do
 	;;
     esac
   done
-else
+  ORB_LIBS="$MICO_LIBS"
-MICO_LIBS="$ORBIT_LIBS"
+  ORB_CFLAGS="$MICO_CFLAGS"
-MICO_VERS=""
 fi
-AC_SUBST(MICO_LIBS)
+AC_SUBST(ORB_LIBS)
-AC_SUBST(MICO_VERS)
+AC_SUBST(ORB_CFLAGS)
 
 dnl gnome-session
 dnl $GNOME_HAVE_SM comes from GNOME_X_CHECKS
@@ -142,12 +146,13 @@ SMPROXY_DEFS=
 rm -fr conftestdir
 if mkdir conftestdir; then
   cd conftestdir
-  # STD_CPP_DEFINES is in the Makefiles generated with X11R6/6.1/6.3
+  # STD_DEFINES is in the Makefiles generated with X11R6/6.1/6.3
   # and Solaris 2.5 OpenWindows `xmkmf's.  I haven't tested with
-  # older versions.  FIXME if necessary.
+  # older versions.  FIXME if necessary.  Alternative may be
+  # $(ALLDEFINES).
   cat > Imakefile <<'EOF'
 acfinddefs:
-	@echo 'ac_x_cpp_defs="${STD_CPP_DEFINES}"'
+	@echo 'ac_x_cpp_defs="${STD_DEFINES}"'
 EOF
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.