aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@axiomatics.org>2016-02-07 04:24:58 -0800
committerGabriel Dos Reis <gdr@axiomatics.org>2016-02-07 04:24:58 -0800
commit8d09ae50338246da65f1f654b9e57206afe95d7f (patch)
tree20bfafa6049dc0237bebe16516648d530d50b541 /config
parent51e79f0190ef9781ad2b695e413a96aad07eb7da (diff)
downloadopen-axiom-8d09ae50338246da65f1f654b9e57206afe95d7f.tar.gz
Fix #1
Add explicit check for <X11/Intrinsic.h>
Diffstat (limited to 'config')
-rw-r--r--config/open-axiom.m45
-rw-r--r--config/openaxiom-c-macros.h.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index ac4610b8..4c4a7221 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -1035,7 +1035,8 @@ AC_PATH_XTRA
## inspired by AC_PATH_XTRA. I don't have time to get to that
## complication right now. Will fix later.
## But we can check for the existence of <X11/xpm.h>
-X_PRE_LIBS="-lXpm $X_PRE_LIBS"
+## Also check for Xt headers
+X_PRE_LIBS="-lXpm -Xt $X_PRE_LIBS"
AC_SUBST(X_PRE_LIBS)
## If the system supports X11, then build graphics
@@ -1051,6 +1052,8 @@ else
LDFLAGS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
AC_CHECK_HEADERS([X11/xpm.h],[],
[AC_MSG_ERROR([The header <X11/xpm.h> could not be found. Install Xpm development package and re-start the configuration process.])])
+ AC_CHECK_HEADERS([X11/Intrinsic.h],[],
+ [AC_MSG_ERROR([The header <X11/Intrinsic.h> could not be found. Install Xt development package and re-start the configuration process.])])
oa_use_x=yes
oa_c_runtime="$oa_c_runtime graphics"
LDFLAGS=$oa_saved_ldflags
diff --git a/config/openaxiom-c-macros.h.in b/config/openaxiom-c-macros.h.in
index 123648aa..0ec30abc 100644
--- a/config/openaxiom-c-macros.h.in
+++ b/config/openaxiom-c-macros.h.in
@@ -139,6 +139,9 @@
/* Define to 1 if you have the <winsock2.h> header file. */
#undef HAVE_WINSOCK2_H
+/* Define to 1 if you have the <X11/Intrinsic.h> header file. */
+#undef HAVE_X11_INTRINSIC_H
+
/* Define to 1 if you have the <X11/xpm.h> header file. */
#undef HAVE_X11_XPM_H