Mercurial > dwindows

changeset 2160:07f1366a724c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename config.h(.in) to dwconfig.h and install it with dwcompat. Building modules that use dwcompat requires some of the defines in dwconfig.h. On some platforms without it the opendir headers are not included and cause build failures. Unix (Linux, BSD, Solaris and Mac) are primarily affected.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 29 Sep 2020 22:49:04 +0000
parents 48172881415c
children a1bf891d5990
files Makefile.in config.h.in configure configure.in dwcompat.h dwconfig.h.in gtk/dw.c gtk3/dw.c
diffstat 8 files changed, 68 insertions(+), 68 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Sep 29 04:06:20 2020 +0000
+++ b/Makefile.in	Tue Sep 29 22:49:04 2020 +0000
@@ -114,6 +114,7 @@
 	$(INSTALL) -d $(prefix)/lib; \
 	$(INSTALL) $(SYSCONF_LINK_TARGET2) $(prefix)/lib; \
 	$(INSTALL) $(srcdir)/dwcompat.h $(prefix)/include; \
+	$(INSTALL) $(srcdir)/dwconfig.h $(prefix)/include; \
 	cd $(prefix)/lib; \
 	rm -f lib$(TARGET2).$(SOSUFFIX) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ); \
 	ln -sf $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX); \
@@ -130,6 +131,7 @@
 	rm -f $(prefix)/bin/dwindows-config
 	rm -f $(prefix)/bin/dwtest
 	rm -f $(prefix)/include/dwcompat.h
+	rm -f $(prefix)/include/dwconfig.h
 	rm -f $(prefix)/include/dw.h
 	rm -f $(prefix)/share/applications/org.dbsoft.dwindows.dwtest.desktop
 	rm -f $(prefix)/share/man/man1/dwindows-config.1.gz
@@ -140,7 +142,7 @@
 	(cd tmp;tar zxvf ../../$(srcdir)/$(SRCDIR).tar.gz;cd $(SRCDIR);dpkg-buildpackage -rfakeroot;cd ..;ls -l)
 
 distclean: clean
-	rm -f config.status config.log config.h
+	rm -f config.status config.log dwconfig.h
 	rm -f dwindows-config dwindows-config1 dwindows.pc dwindows1.pc
 	rm -f org.dbsoft.dwindows.dwtest.desktop
 	rm -f Makefile
--- a/config.h.in	Tue Sep 29 04:06:20 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if you have the connect function.  */
-#undef HAVE_CONNECT
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <sys/stat.h> header file.  */
-#undef HAVE_SYS_STAT_H
-
-/* Determine whether we have the pipe function */
-#undef HAVE_PIPE
-
-/* Determine whether we have the vsnprintf function */
-#undef HAVE_VSNPRINTF
-
-/* Define if WebKit is available */
-#undef USE_WEBKIT
-
-/* Define if webkit-1.0 is available */
-#undef USE_WEBKIT10
-
-/* Define if webkit-1.1 is available */
-#undef USE_WEBKIT11
-
-/* Define if webkit2 is available */
-#undef USE_WEBKIT2
-
-/* Define if IMLIB is available. */
-#undef USE_IMLIB
-
-/* Define if PIXBUF is available. */
-#undef USE_PIXBUF
-
-/* Define if USING GTK (but not on X11). */
-#undef DW_USE_GTK
-
-/* Define if we have Ubuntu overlay scrollbars */
-#undef HAVE_OVERLAY_SCROLLBARS
-
-/* Define if we have Ubuntu overlay scrollbars (GTK2) */
-#undef HAVE_OVERLAY_SCROLLBARS2
-
--- a/configure	Tue Sep 29 04:06:20 2020 +0000
+++ b/configure	Tue Sep 29 22:49:04 2020 +0000
@@ -2229,7 +2229,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers dwconfig.h"
 
 
 TARGET="dwindows"
@@ -7231,7 +7231,7 @@
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "dwconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS dwconfig.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "dwindows1.pc") CONFIG_FILES="$CONFIG_FILES dwindows1.pc" ;;
     "dwindows-config1") CONFIG_FILES="$CONFIG_FILES dwindows-config1" ;;
--- a/configure.in	Tue Sep 29 04:06:20 2020 +0000
+++ b/configure.in	Tue Sep 29 22:49:04 2020 +0000
@@ -1,5 +1,5 @@
 AC_INIT(winmain.c)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(dwconfig.h)
 
 TARGET="dwindows"
 TARGET2="dwcompat"
--- a/dwcompat.h	Tue Sep 29 04:06:20 2020 +0000
+++ b/dwcompat.h	Tue Sep 29 22:49:04 2020 +0000
@@ -5,9 +5,7 @@
 
 /* This header includes and defines everything needed for a given OS/compiler */
 #if defined(__UNIX__) || defined(__MAC__)
-#ifdef BUILD_DLL
-#include "config.h"
-#endif
+#include "dwconfig.h"
 
 /* Attempt to include 64 bit file functions on various unix flavors */
 #ifndef _FILE_OFFSET_BITS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dwconfig.h.in	Tue Sep 29 22:49:04 2020 +0000
@@ -0,0 +1,59 @@
+/* dwconfig.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define if you have the connect function.  */
+#undef HAVE_CONNECT
+
+/* Define if you have the <dirent.h> header file.  */
+#undef HAVE_DIRENT_H
+
+/* Define if you have the <ndir.h> header file.  */
+#undef HAVE_NDIR_H
+
+/* Define if you have the <sys/dir.h> header file.  */
+#undef HAVE_SYS_DIR_H
+
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <sys/stat.h> header file.  */
+#undef HAVE_SYS_STAT_H
+
+/* Determine whether we have the pipe function */
+#undef HAVE_PIPE
+
+/* Determine whether we have the vsnprintf function */
+#undef HAVE_VSNPRINTF
+
+/* Define if WebKit is available */
+#undef USE_WEBKIT
+
+/* Define if webkit-1.0 is available */
+#undef USE_WEBKIT10
+
+/* Define if webkit-1.1 is available */
+#undef USE_WEBKIT11
+
+/* Define if webkit2 is available */
+#undef USE_WEBKIT2
+
+/* Define if IMLIB is available. */
+#undef USE_IMLIB
+
+/* Define if PIXBUF is available. */
+#undef USE_PIXBUF
+
+/* Define if USING GTK (but not on X11). */
+#undef DW_USE_GTK
+
+/* Define if we have Ubuntu overlay scrollbars */
+#undef HAVE_OVERLAY_SCROLLBARS
+
+/* Define if we have Ubuntu overlay scrollbars (GTK2) */
+#undef HAVE_OVERLAY_SCROLLBARS2
+
--- a/gtk/dw.c	Tue Sep 29 04:06:20 2020 +0000
+++ b/gtk/dw.c	Tue Sep 29 22:49:04 2020 +0000
@@ -7,7 +7,7 @@
  * (C) 2003-2011 Mark Hessling <mark@rexx.org>
  * (C) 2002 Nickolay V. Shmyrev <shmyrev@yandex.ru>
  */
-#include "config.h"
+#include "dwconfig.h"
 #include "dw.h"
 #include <string.h>
 #include <stdlib.h>
--- a/gtk3/dw.c	Tue Sep 29 04:06:20 2020 +0000
+++ b/gtk3/dw.c	Tue Sep 29 22:49:04 2020 +0000
@@ -7,7 +7,7 @@
  * (C) 2003-2011 Mark Hessling <mark@rexx.org>
  * (C) 2002 Nickolay V. Shmyrev <shmyrev@yandex.ru>
  */
-#include "config.h"
+#include "dwconfig.h"
 #include "dw.h"
 #include <glib/gi18n.h>
 #include <string.h>