Cleanup for GNOME 2 port Allow disabling of screensaver capplet compile if

2001-10-26  Bradford Hovinen  <hovinen@ximian.com>

	* configure.in: Cleanup for GNOME 2 port
	Allow disabling of screensaver capplet compile if xscreensaver
	is not found
	(AC_OUTPUT): Removed dnl capplets/rollback/Makefile as it caused
	some difficulties

1 files changed, 33 insertions, 4 deletions

diff --git a/autogen.sh b/autogen.sh
index 5b2674097..90a1d2e30 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,13 +4,42 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="GNOME Control Center"
+PKG_NAME="control-center"
 
-(test -f $srcdir/capplets/common/capplet-util.h \
+(test -f $srcdir/configure.in \
+  && test -f $srcdir/autogen.sh \
   && test -d $srcdir/control-center) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level "\`$PKG_NAME\'" directory"
+    echo " top-level $PKG_NAME directory"
     exit 1
 }
 
-. $srcdir/macros/autogen.sh
+DIE=0
+
+rm -f .using-gnome-libs-package
+
+# This is a bit complicated here since we can't use gnome-config yet.
+# It'll be easier after switching to pkg-config since we can then
+# use pkg-config to find the gnome-autogen.sh script.
+
+gnome_autogen=
+gnome_datadir=
+
+ifs_save="$IFS"; IFS=":"
+for dir in $PATH ; do
+  test -z "$dir" && dir=.
+  if test -f $dir/gnome-autogen.sh ; then
+    gnome_autogen="$dir/gnome-autogen.sh"
+    gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'`
+    break
+  fi
+done
+IFS="$ifs_save"
+
+if test -z "$gnome_autogen" ; then
+  echo "You need to install the gnome-common module and make"
+  echo "sure the gnome-autogen.sh script is in your \$PATH."
+  exit 1
+fi
+
+GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . $gnome_autogen