# HG changeset patch
# User masneyb
# Date 1073238063 0
# Node ID ae7f8b9bd2e49c94f59aa04e33e78f08d1a71d65
# Parent  e5ad008e7ea83014bb3cd76bb3de02439e9fe2cc
2003-1-4 Brian Masney <masneyb@gftp.org>

        * configure.in - added src/uicommon/Makefile to the list of files to
        be generated.

        * configure.in lib/gftp.h - check for sys/mkdev.h header file. If it is
        found, include it. Solaris needs this for major() and minor()

diff -r e5ad008e7ea8 -r ae7f8b9bd2e4 ChangeLog
--- a/ChangeLog	Sun Jan 04 17:31:59 2004 +0000
+++ b/ChangeLog	Sun Jan 04 17:41:03 2004 +0000
@@ -1,4 +1,10 @@
 2003-1-4 Brian Masney <masneyb@gftp.org>
+	* configure.in - added src/uicommon/Makefile to the list of files to
+	be generated. 
+
+	* configure.in lib/gftp.h - check for sys/mkdev.h header file. If it is
+	found, include it. Solaris needs this for major() and minor()
+
 	* src/uicommon/gftpui.c src/uicommon/gftpui.h
 	src/uicommon/gftpuicallbacks.c - when switching between ascii/binary,
 	set the option on a global basis. Converted chdir, chmod, delete,
@@ -1905,7 +1911,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.192 2004/01/04 17:31:58 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.193 2004/01/04 17:41:02 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r e5ad008e7ea8 -r ae7f8b9bd2e4 configure.in
--- a/configure.in	Sun Jan 04 17:31:59 2004 +0000
+++ b/configure.in	Sun Jan 04 17:41:03 2004 +0000
@@ -53,7 +53,7 @@
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h libutil.h limits.h malloc.h pty.h strings.h sys/ioctl.h sys/time.h unistd.h stdint.h)
+AC_CHECK_HEADERS(fcntl.h libutil.h limits.h malloc.h pty.h strings.h sys/ioctl.h sys/time.h unistd.h stdint.h sys/mkdev.h)
 
 AC_TYPE_SOCKLEN_T
 AC_TYPE_MODE_T
@@ -284,4 +284,4 @@
 AC_CHECK_PROG(DB2HTML, db2html, true, false)
 AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
 
-AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile lib/Makefile src/gftp src/Makefile src/gtk/Makefile src/text/Makefile gftp.spec intl/Makefile po/Makefile.in)
+AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile lib/Makefile src/gftp src/Makefile src/uicommon/Makefile src/gtk/Makefile src/text/Makefile gftp.spec intl/Makefile po/Makefile.in)
diff -r e5ad008e7ea8 -r ae7f8b9bd2e4 lib/gftp.h
--- a/lib/gftp.h	Sun Jan 04 17:31:59 2004 +0000
+++ b/lib/gftp.h	Sun Jan 04 17:41:03 2004 +0000
@@ -95,6 +95,11 @@
 #define GFTP_GET_AI_FAMILY(request)	AF_INET
 #endif
 
+/* Solaris needs this included for major()/minor() */
+#ifdef HAVE_SYS_MKDEV_H
+#include <sys/mkdev.h>
+#endif
+
 /* We need the major() and minor() macros in the user interface. If they aren't
    defined by the system, we'll just define them here. */
 #ifndef major