]> git.proxmox.com Git - mirror_frr.git/commitdiff
[configure] remove unused/broken autoconf cache variable ac_statedir
authorJeremy Jackson <jerj@coplanar.net>
Thu, 22 Jan 2009 01:29:39 +0000 (20:29 -0500)
committerPaul Jakma <paul@quagga.net>
Fri, 19 Jun 2009 14:03:31 +0000 (15:03 +0100)
It wasn't used, and the code wasn't printing progress or the result in some
cases.  the test uses minimal resources, so it's probably better to not
cache so as to avoid inconsistencies if --with-prefix or directory variables
are changed between ./configure runs.

configure.ac

index 16aad98c01edad1f3a0df2130eedff72b77c5548..63cef65b2fb2271341de761aecc079123f13da28 100755 (executable)
@@ -1444,14 +1444,14 @@ AC_SUBST(PILDFLAGS)
 dnl ------------------------------
 dnl set paths for state directory
 dnl ------------------------------
+AC_MSG_CHECKING(directory to use for state file)
 if test "${prefix}" = "NONE"; then
   quagga_statedir_prefix="";
 else
   quagga_statedir_prefix=${prefix}
 fi
 if test "${localstatedir}" = '${prefix}/var'; then
-  AC_CACHE_CHECK(state directory,ac_statedir,
-  [for QUAGGA_STATE_DIR in ${quagga_statedir_prefix}/var/run dnl
+  for QUAGGA_STATE_DIR in ${quagga_statedir_prefix}/var/run dnl
                        ${quagga_statedir_prefix}/var/adm dnl
                        ${quagga_statedir_prefix}/etc dnl
                        /var/run        dnl
@@ -1461,16 +1461,15 @@ if test "${localstatedir}" = '${prefix}/var'; then
   do
     test -d $QUAGGA_STATE_DIR && break
   done
-  quagga_statedir=$QUAGGA_STATE_DIR])
+  quagga_statedir=$QUAGGA_STATE_DIR
 else
   quagga_statedir=${localstatedir}
-  AC_MSG_CHECKING(directory to use for state file)
-  AC_MSG_RESULT(${quagga_statedir})
-  AC_SUBST(quagga_statedir)
 fi
 if test $quagga_statedir = "/dev/null"; then
     AC_MSG_ERROR('STATE DIRECTORY NOT FOUND! FIX OR SPECIFY --localstatedir!')
 fi
+AC_MSG_RESULT(${quagga_statedir})
+AC_SUBST(quagga_statedir)
 
 AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$quagga_statedir/zebra.pid",zebra PID)
 AC_DEFINE_UNQUOTED(PATH_RIPD_PID, "$quagga_statedir/ripd.pid",ripd PID)