revert bad commit: add missing glob.h and fnmatch.h in configure.ac, add struct sb in poptconfig.c

3 files changed, 3 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 13a3bee..d05dfdf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.17 -> 2.0:
+    - devzero2000: revert bad commit: add missing glob.h and fnmatch.h in configure.ac, add struct sb in poptconfig.c
     - devzero2000: Rewrite the logic in poptReadDefaultConfig 
       for finding the popt alias file
     - devzero2000: update .cvsignore
diff --git a/configure.ac b/configure.ac
index c9e3ad6..c643c5c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -224,7 +224,7 @@ AM_CONDITIONAL([HAVE_MCCABE],[test "x$MCCABE" != xNO_MCCABE])
 # Checks for libraries.
 
 # Checks for header files.
-AC_CHECK_HEADERS([assert.h fcntl.h float.h langinfo.h libintl.h limits.h sys/ioctl.h wchar.h alloca.h])
+AC_CHECK_HEADERS([assert.h glob.h fnmatch.h fcntl.h float.h langinfo.h libintl.h limits.h sys/ioctl.h wchar.h alloca.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
diff --git a/poptconfig.c b/poptconfig.c
index c569fab..bb07b8d 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -494,6 +494,7 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 {
     static const char _popt_alias[] = POPT_ALIAS;
     char * home;
+    struct stat sb;
     int rc = 0;		/* assume success */
 
     if (con->appName == NULL) goto exit;