Обсуждение: acinclude.m4.patch

The attached patch to acinclude.m4 implements the following changes:

*) Check for xrc and stc headers to avoid compile problems.

I should point out that, because of the very complex nature of the
wxWindows system, that I am only able to test for the existance of the
include files, not whether they successfully preprocess.  This shouldn't
really cause too many problems, since a bad header will certainly cause
problems later on, and we don't use the config.h produced by autoconf
anyway.

ahp
--- pgadmin3/acinclude.m4    2003-08-17 05:41:15.000000000 -0400
+++ pgadmin3.new/acinclude.m4    2003-08-19 15:27:25.000000000 -0400
@@ -339,10 +339,21 @@
         *)
             ;;
     esac
-    AC_LANG_SAVE
-    AC_LANG_C
-    AC_CHECK_HEADER(wx/version.h, [wx_wx_h=yes], [wx_wx_h=no])
-    AC_LANG_RESTORE
+    wx_wx_h="yes"
+    if test ! -f "${WX_HOME}/include/wx/version.h"
+    then
+        wx_wx_h="no"
+    fi
+    if test ! -f "${WX_HOME}/include/wx/stc/stc.h"
+    then
+        AC_MSG_ERROR([you need to install the src package from wxWindows/contrib/src/stc])
+        wx_wx_h="no"
+    fi
+    if test ! -f "${WX_HOME}/include/wx/xrc/xml.h"
+    then
+        AC_MSG_ERROR([you need to install the xrc package from wxWindows/contrib/src/stc])
+        wx_wx_h="no"
+    fi
     if test "$wx_wx_h" = "yes"
     then
         AC_MSG_CHECKING([wxWindows in ${WX_HOME}])

Thanks Adam, patch applied (I corrected the stc error message which had
a typo).

Regards, Dave.

> -----Original Message-----
> From: Adam H. Pendleton [mailto:fmonkey@fmonkey.net]
> Sent: 19 August 2003 20:55
> To: pgadmin-hackers
> Subject: [pgadmin-hackers] acinclude.m4.patch
>
>
> The attached patch to acinclude.m4 implements the following changes:
>
> *) Check for xrc and stc headers to avoid compile problems.
>
> I should point out that, because of the very complex nature of the
> wxWindows system, that I am only able to test for the
> existance of the
> include files, not whether they successfully preprocess.
> This shouldn't
> really cause too many problems, since a bad header will
> certainly cause
> problems later on, and we don't use the config.h produced by autoconf
> anyway.
>
> ahp
>