Changeset 36

Timestamp:

Nov 28, 2006, 8:08:14 PM (18 years ago)

Author:

jbarnold

Message:

Improved package dependency tracking

Location:

server

Files:

• common/oursrc/execsys/Makefile.in (modified) (1 diff)
• common/oursrc/execsys/mrproper (added)
• common/oursrc/lockeradm/Makefile.in (modified) (1 diff)
• common/oursrc/lockeradm/configure.in (modified) (2 diffs)
• common/oursrc/lockeradm/mrproper (added)
• common/oursrc/sqladm/Makefile.in (modified) (1 diff)
• common/oursrc/sqladm/mrproper (added)
• common/oursrc/tokensys/Makefile.in (modified) (1 diff)
• common/oursrc/tokensys/configure.in (modified) (1 diff)
• common/oursrc/tokensys/mrproper (added)
• fedora/Makefile (modified) (2 diffs)
• fedora/specs/lockeradm.spec (modified) (2 diffs)
• fedora/specs/tokensys.spec (modified) (2 diffs)

server/common/oursrc/execsys/Makefile.in

@@ -12 +12 @@
 clean:
         rm -f staticsys-cat
-
-preauto: clean
-        rm -f configure config.* Makefile
-        rm -rf auto*.cache
-
-ready: preauto
-        autoconf

server/common/oursrc/lockeradm/Makefile.in

@@ -10 +10 @@
 clean:
         rm -f signup-scripts-frontend
-
-preauto: clean
-        rm -f configure config.* Makefile admof signup-scripts-backend
-        rm -rf auto*.cache
-
-ready: preauto
-        autoconf

server/common/oursrc/lockeradm/configure.in

@@ -5 +5 @@
 dnl Needed by admof.in
 
-AC_PATH_PROG(fs_path, fs)
+AC_ARG_WITH(fs,
+[  --with-fs[=PATH]          fs is located at PATH],[
+  if test "$withval" != "no" -a "$withval" != "yes"; then
+    fs_path="$withval"
+  fi
+])
 AC_SUBST(fs_path)
-AC_PATH_PROG(pts_path, pts)
+if test "$fs_path" = ""; then
+        AC_ERROR(Cannot find fs)
+fi
+
+AC_ARG_WITH(pts,
+[  --with-pts[=PATH]         pts is located at PATH],[
+  if test "$withval" != "no" -a "$withval" != "yes"; then
+    pts_path="$withval"
+  fi
+])
 AC_SUBST(pts_path)
+if test "$pts_path" = ""; then
+        AC_ERROR(Cannot find pts)
+fi
 
 dnl Needed by signup-scripts-backend.in
@@ -14 +31 @@
 AC_PATH_PROG(ls_path, ls)
 AC_SUBST(ls_path)
+if test "$ls_path" = ""; then
+        AC_ERROR(Cannot find ls)
+fi
 AC_PATH_PROG(grep_path, grep)
 AC_SUBST(grep_path)
+if test "$grep_path" = ""; then
+        AC_ERROR(Cannot find grep)
+fi
 
 AC_PATH_PROG(sudo_path, sudo)
 AC_SUBST(sudo_path)
+if test "$sudo_path" = ""; then
+        AC_ERROR(Cannot find sudo)
+fi
 AC_PATH_PROG(useradd_path, useradd)
 AC_SUBST(useradd_path)
+if test "$useradd_path" = ""; then
+        AC_ERROR(Cannot find useradd)
+fi
 AC_PATH_PROG(groupadd_path, groupadd)
 AC_SUBST(groupadd_path)
+if test "$groupadd_path" = ""; then
+        AC_ERROR(Cannot find groupadd)
+fi
+
 AC_PATH_PROG(setquota_path, setquota)
 AC_SUBST(setquota_path)
+if test "$setquota_path" = ""; then
+        AC_ERROR(Cannot find setquota)
+fi
 
 AC_PATH_PROG(hesinfo_path, hesinfo)
 AC_SUBST(hesinfo_path)
+if test "$hesinfo_path" = ""; then
+        AC_ERROR(Cannot find hesinfo)
+fi
 
 dnl Needed by modbash.in
 
 AC_PATH_PROG(bash_path, bash)
-AC_SUBST(bash)
+AC_SUBST(bash_path)
+if test "$bash_path" = ""; then
+        AC_ERROR(Cannot find bash)
+fi
 
 AC_OUTPUT(Makefile)

server/common/oursrc/sqladm/Makefile.in

@@ -10 +10 @@
 clean:
         rm -f signup-sql
-
-preauto: clean
-        rm -f configure config.* Makefile signup-sql
-        rm -rf auto*.cache
-
-ready: preauto
-        autoconf

server/common/oursrc/tokensys/Makefile.in

@@ -2 +2 @@
 CFLAGS = @CFLAGS@
 prefix = @prefix@
-
-preauto: 
-        rm -f configure config.* Makefile renew
-        rm -rf auto*.cache
-
-ready: preauto
-        autoconf

server/common/oursrc/tokensys/configure.in

@@ -1 +1 @@
 AC_INIT()
 
-AC_PATH_PROG(kinit_path, kinit)
+AC_ARG_WITH(kinit,
+[  --with-kinit[=PATH]       kinit is located at PATH],[
+  if test "$withval" != "no" -a "$withval" != "yes"; then
+    kinit_path="$withval"
+  fi
+])
 AC_SUBST(kinit_path)
+if test "$kinit_path" = ""; then
+        AC_ERROR(Cannot find kinit)
+fi
 
-AC_PATH_PROG(aklog_path, aklog)
+AC_ARG_WITH(aklog,
+[  --with-aklog[=PATH]       aklog is located at PATH],[
+  if test "$withval" != "no" -a "$withval" != "yes"; then
+    aklog_path="$withval"
+  fi
+])
 AC_SUBST(aklog_path)
+if test "$aklog_path" = ""; then
+        AC_ERROR(Cannot find aklog)
+fi
 
 AC_OUTPUT(Makefile)

server/fedora/Makefile

@@ -84 +84 @@
         for i in $$list; do \
                 pushd $$i; \
+                ./mrproper; \
                 autoconf; \
-                ./configure; \
-                make ready; \
                 popd; \
                 tar -czf $(tmp_src)/$$i.tar.gz $$i; \
@@ -129 +128 @@
 install-suexec:
         install -m 4510 -o 0 -g apache ${PWD}/sbin/suexec /usr/sbin/;
+
+# The following packages are needed for *building* all of our packages
+# basic deps: rpm-build through autoconf
+# oursrc: hesinfo
+# httpd: xmlto through distcache-devel
+# krb5: bison through texinfo
+# openafs: pam-devel through automake
+install-build-deps:
+        yum -y install rpm-build gcc autoconf hesinfo xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel bison ncurses-devel texinfo pam-devel automake
+
+# The following packages are needed for *installing* all of our packages
+install-deps:
+        yum -y krb5-workstation

server/fedora/specs/lockeradm.spec

@@ -10 +10 @@
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
 %define debug_package %{nil}
+Prereq: /usr/bin/fs, /usr/bin/pts
 
 %description 
@@ -24 +25 @@
 
 %build
-./configure
+./configure --with-fs=/usr/bin/fs --with-pts=/usr/bin/pts
 make
 

server/fedora/specs/tokensys.spec

@@ -10 +10 @@
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
 %define debug_package %{nil}
+Prereq: /usr/kerberos/bin/kinit, /usr/bin/aklog
 
 %description 
@@ -23 +24 @@
 
 %build
-./configure
+./configure --with-kinit=/usr/kerberos/bin/kinit --with-aklog=/usr/bin/aklog
 
 %install