Auto* without AM_CONDITIONALS

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 137e8741e1b3b5c15874c56dd3446f25b1c46c71..5f7a4f5991a28832be14530049d65efb87af3396 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,18 +1,10 @@
 AUTOMAKE_OPTIONS = foreign
 
-if NO_LIBGEN_H
-libgen_header = libgen.h
-endif
-if NO_STDINT_H
-stdint_header = stdint.h
-endif
-if LOG_PERROR_DOESNT_WORK
-syslog_header = syslog.h
-syslog_source = syslog.c
-endif
-
-include_HEADERS = $(libgen_header) $(stdint_header) $(syslog_header)
+include_HEADERS = @libgen_header@ @stdint_header@ @syslog_header@
+EXTRA_HEADERS = libgen.h stdint.h syslog.h
 
 lib_LIBRARIES = libcompat.a
-libcompat_a_SOURCES = $(syslog_source)
+libcompat_a_SOURCES =
 EXTRA_libcompat_a_SOURCES = syslog.c
+libcompat_a_LIBADD = @syslog_object@
+libcompat_a_DEPENDENCIES = @syslog_object@

diff --git a/compat/Makefile.in b/compat/Makefile.in
index 4827a1679a5964993952d50613d32a7687321d27..3891f6869b17259712ab84e18b0c2fccfcd3534f 100644 (file)
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -63,19 +63,21 @@ MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
+libgen_header = @libgen_header@
+stdint_header = @stdint_header@
+syslog_header = @syslog_header@
+syslog_object = @syslog_object@
 
 AUTOMAKE_OPTIONS = foreign
 
-@NO_LIBGEN_H_TRUE@libgen_header = @NO_LIBGEN_H_TRUE@libgen.h
-@NO_STDINT_H_TRUE@stdint_header = @NO_STDINT_H_TRUE@stdint.h
-@LOG_PERROR_DOESNT_WORK_TRUE@syslog_header = @LOG_PERROR_DOESNT_WORK_TRUE@syslog.h
-@LOG_PERROR_DOESNT_WORK_TRUE@syslog_source = @LOG_PERROR_DOESNT_WORK_TRUE@syslog.c
-
-include_HEADERS = $(libgen_header) $(stdint_header) $(syslog_header)
+include_HEADERS = @libgen_header@ @stdint_header@ @syslog_header@
+EXTRA_HEADERS = libgen.h stdint.h syslog.h
 
 lib_LIBRARIES = libcompat.a
-libcompat_a_SOURCES = $(syslog_source)
+libcompat_a_SOURCES = 
 EXTRA_libcompat_a_SOURCES = syslog.c
+libcompat_a_LIBADD = @syslog_object@
+libcompat_a_DEPENDENCIES = @syslog_object@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES = 
@@ -86,9 +88,7 @@ DEFS = @DEFS@ -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libcompat_a_LIBADD = 
-@LOG_PERROR_DOESNT_WORK_FALSE@libcompat_a_OBJECTS = 
-@LOG_PERROR_DOESNT_WORK_TRUE@libcompat_a_OBJECTS =  syslog.o
+libcompat_a_OBJECTS = 
 AR = ar
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

diff --git a/compat/configure b/compat/configure
index a97493fd24c387c8742c1edc2ece1b9a34cab308..97847c5d75c276b07c6c3860d3d7dc68b530b6ee 100644 (file)
--- a/compat/configure
+++ b/compat/configure
@@ -1214,21 +1214,19 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-for ac_hdr in /usr/include/libgen.h /usr/include/stdint.h /usr/include/syslog.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1222: checking for $ac_hdr" >&5
+ac_safe=`echo "/usr/include/libgen.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for /usr/include/libgen.h""... $ac_c" 1>&6
+echo "configure:1220: checking for /usr/include/libgen.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1227 "configure"
+#line 1225 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+#include </usr/include/libgen.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1244,72 +1242,113 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+  libgen_header=
 else
   echo "$ac_t""no" 1>&6
+libgen_header=libgen.h
 fi
-done
-
 
-
-if test x"$ac_cv_header__usr_include_libgen_h" != x"yes"; then
-  NO_LIBGEN_H_TRUE=
-  NO_LIBGEN_H_FALSE='#'
+ac_safe=`echo "/usr/include/stdint.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for /usr/include/stdint.h""... $ac_c" 1>&6
+echo "configure:1254: checking for /usr/include/stdint.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  NO_LIBGEN_H_TRUE='#'
-  NO_LIBGEN_H_FALSE=
+  cat > conftest.$ac_ext <<EOF
+#line 1259 "configure"
+#include "confdefs.h"
+#include </usr/include/stdint.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  stdint_header=
+else
+  echo "$ac_t""no" 1>&6
+stdint_header=stdint.h
 fi
 
 
-if test x"$ac_cv_header__usr_include_stdint_h" != x"yes"; then
-  NO_STDINT_H_TRUE=
-  NO_STDINT_H_FALSE='#'
+ac_safe=`echo "/usr/include/syslog.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for /usr/include/syslog.h""... $ac_c" 1>&6
+echo "configure:1289: checking for /usr/include/syslog.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1294 "configure"
+#include "confdefs.h"
+#include </usr/include/syslog.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
 else
-  NO_STDINT_H_TRUE='#'
-  NO_STDINT_H_FALSE=
+  echo "$ac_t""no" 1>&6
 fi
-log_perror_doesnt_work="no"
-syslog_source=""
+
 if test x"$ac_cv_header__usr_include_syslog_h" = x"yes"
 then
-       echo $ac_n "checking wether LOG_PERROR doesn't work""... $ac_c" 1>&6
-echo "configure:1281: checking wether LOG_PERROR doesn't work" >&5
+       echo $ac_n "checking whether LOG_PERROR works""... $ac_c" 1>&6
+echo "configure:1323: checking whether LOG_PERROR works" >&5
        cat >conftest.$ac_ext <<EOF
        #include <syslog.h>
        main() {
                openlog("configure", LOG_PERROR, LOG_USER);
-               syslog(LOG_DEBUG, "Hello, world");
+               syslog(LOG_DEBUG, "Bla, world");
                closelog();
        }
 EOF
-       if { (eval echo configure:1290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && ./conftest 2>&1 1>/dev/null | grep Hello >/dev/null
+       if { (eval echo configure:1332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && ./conftest 2>&1 1>/dev/null | grep Hello >/dev/null
        then
-               :
+               echo "$ac_t"""yes"" 1>&6
+               syslog_header=
+               syslog_object=
        else
+               echo "$ac_t"""no"" 1>&6
                cat >> confdefs.h <<\EOF
 #define LOG_PERROR_DOESNT_WORK 1
 EOF
 
-               log_perror_doesnt_work="yes"
-               syslog_source="syslog.c"
+               syslog_header=syslog.h
+               syslog_object=syslog.o
        fi
        rm -fr conftest*
-       echo "$ac_t""$log_perror_doesnt_work" 1>&6
 fi
 
 
 
-if test x"$log_perror_doesnt_work" = x"yes"; then
-  LOG_PERROR_DOESNT_WORK_TRUE=
-  LOG_PERROR_DOESNT_WORK_FALSE='#'
-else
-  LOG_PERROR_DOESNT_WORK_TRUE='#'
-  LOG_PERROR_DOESNT_WORK_FALSE=
-fi
+
+
 
 
 
@@ -1475,12 +1514,10 @@ s%@MAINT@%$MAINT%g
 s%@CC@%$CC%g
 s%@RANLIB@%$RANLIB%g
 s%@CPP@%$CPP%g
-s%@NO_LIBGEN_H_TRUE@%$NO_LIBGEN_H_TRUE%g
-s%@NO_LIBGEN_H_FALSE@%$NO_LIBGEN_H_FALSE%g
-s%@NO_STDINT_H_TRUE@%$NO_STDINT_H_TRUE%g
-s%@NO_STDINT_H_FALSE@%$NO_STDINT_H_FALSE%g
-s%@LOG_PERROR_DOESNT_WORK_TRUE@%$LOG_PERROR_DOESNT_WORK_TRUE%g
-s%@LOG_PERROR_DOESNT_WORK_FALSE@%$LOG_PERROR_DOESNT_WORK_FALSE%g
+s%@libgen_header@%$libgen_header%g
+s%@stdint_header@%$stdint_header%g
+s%@syslog_header@%$syslog_header%g
+s%@syslog_object@%$syslog_object%g
 
 CEOF
 EOF

diff --git a/compat/configure.in b/compat/configure.in
index 1b49681c1c44ce64b07d0cd9025bb36becb00ae9..9dae3e8728093f0d946e4678eb8c8eb53ac9218f 100644 (file)
--- a/compat/configure.in
+++ b/compat/configure.in
@@ -12,35 +12,39 @@ AC_PROG_RANLIB
 dnl Checks for libraries.
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(/usr/include/libgen.h /usr/include/stdint.h /usr/include/syslog.h)
-AM_CONDITIONAL(NO_LIBGEN_H, test x"$ac_cv_header__usr_include_libgen_h" != x"yes")
-AM_CONDITIONAL(NO_STDINT_H, test x"$ac_cv_header__usr_include_stdint_h" != x"yes")
-log_perror_doesnt_work="no"
-syslog_source=""
+AC_CHECK_HEADER(/usr/include/libgen.h, libgen_header=, libgen_header=libgen.h)
+AC_CHECK_HEADER(/usr/include/stdint.h, stdint_header=, stdint_header=stdint.h)
+
+AC_CHECK_HEADER(/usr/include/syslog.h)
 if test x"$ac_cv_header__usr_include_syslog_h" = x"yes"
 then
-       AC_MSG_CHECKING([whether LOG_PERROR doesn't work])
+       AC_MSG_CHECKING([whether LOG_PERROR works])
        cat >conftest.$ac_ext <<EOF
        #include <syslog.h>
        main() {
                openlog("configure", LOG_PERROR, LOG_USER);
-               syslog(LOG_DEBUG, "Hello, world");
+               syslog(LOG_DEBUG, "Bla, world");
                closelog();
        }
 EOF
        if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && ./conftest 2>&1 1>/dev/null | grep Hello >/dev/null
        then
-               :
+               AC_MSG_RESULT("yes")
+               syslog_header=
+               syslog_object=
        else
+               AC_MSG_RESULT("no")
                AC_DEFINE(LOG_PERROR_DOESNT_WORK)
-               log_perror_doesnt_work="yes"
-               syslog_source="syslog.c"
+               syslog_header=syslog.h
+               syslog_object=syslog.o
        fi
        rm -fr conftest*
-       AC_MSG_RESULT($log_perror_doesnt_work)
 fi
 
-AM_CONDITIONAL(LOG_PERROR_DOESNT_WORK, test x"$log_perror_doesnt_work" = x"yes")
+AC_SUBST(libgen_header)
+AC_SUBST(stdint_header)
+AC_SUBST(syslog_header)
+AC_SUBST(syslog_object)
 
 dnl Checks for typedefs, structures, and compiler characteristics.