hal ChangeLog, 1.534, 1.535 autogen.sh, 1.2, 1.3 configure.in, 1.83, 1.84

David Zeuthen david at freedesktop.org
Thu Jun 23 07:50:08 PDT 2005


Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv4965

Modified Files:
	ChangeLog autogen.sh configure.in 
Log Message:
2005-06-23  David Zeuthen  <davidz at redhat.com>

        Patch from Alvaro Lopez Ortega <alvaro at sun.com> to add an empty
        Solaris backend to HAL.

        * hald/solaris/osspec.c: New file

        * hald/solaris/Makefile.am: New file

        * configure.in: Add checks for Solaris



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -d -r1.534 -r1.535
--- ChangeLog	21 Jun 2005 17:02:06 -0000	1.534
+++ ChangeLog	23 Jun 2005 14:50:04 -0000	1.535
@@ -1,3 +1,14 @@
+2005-06-23  David Zeuthen  <davidz at redhat.com>
+
+	Patch from Alvaro Lopez Ortega <alvaro at sun.com> to add an empty
+	Solaris backend to HAL.
+
+	* hald/solaris/osspec.c: New file
+
+	* hald/solaris/Makefile.am: New file
+
+	* configure.in: Add checks for Solaris
+
 2005-06-21  David Zeuthen  <davidz at redhat.com>
 
 	* configure.in: This little patch fixes the configure.in file in

Index: autogen.sh
===================================================================
RCS file: /cvs/hal/hal/autogen.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- autogen.sh	23 Sep 2004 18:13:45 -0000	1.2
+++ autogen.sh	23 Jun 2005 14:50:04 -0000	1.3
@@ -63,15 +63,6 @@
   am_opt=--include-deps;;
 esac
 
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    ( cd $dr
-
       aclocalinclude="$ACLOCAL_FLAGS"
 
       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
@@ -90,9 +81,6 @@
       automake --add-missing --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
-    )
-  fi
-done
 
 glib-gettextize --force --copy                              || exit 1
 intltoolize --copy --force --automake                  || exit 1

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- configure.in	21 Jun 2005 17:02:06 -0000	1.83
+++ configure.in	23 Jun 2005 14:50:04 -0000	1.84
@@ -214,7 +214,7 @@
 
 
 
-AC_ARG_WITH(backend, [  --with-backend=<name>   Backend to use (linux2/dummy)],
+AC_ARG_WITH(backend, [  --with-backend=<name>   Backend to use (linux2/solaris/dummy)],
                       [
                       backend=$withval
                       ]
@@ -222,11 +222,19 @@
 if ! test -z "$with_backend" ; then
     HALD_BACKEND="$with_backend"
 else
-    HALD_BACKEND="linux2"
+    case "$host" in
+        *-*-solaris*)
+		   HALD_BACKEND="solaris"
+		   ;;
+	   *)
+		   HALD_BACKEND="linux2"
+             ;;
+    esac
 fi
+AM_CONDITIONAL(HALD_COMPILE_LINUX2, test x$HALD_BACKEND = xlinux2, [Compiling for Linux])
+AM_CONDITIONAL(HALD_COMPILE_SOLARIS, test x$HALD_BACKEND = xsolaris, [Compiling for Solaris])
 AC_SUBST(HALD_BACKEND)
 
-
 dnl DBUS API is subject to changes
 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, ,DBUS API is subject to change)
 AC_SUBST(PACKAGE_CFLAGS)
@@ -441,6 +449,7 @@
 hald/linux2/Makefile
 hald/linux2/probing/Makefile
 hald/linux2/addons/Makefile
+hald/solaris/Makefile
 hald/haldaemon
 libhal/Makefile
 libhal-storage/Makefile




More information about the hal-commit mailing list