added wxSetInstance()

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index c76a98080559c707fd15e4df8057883a6e3af214..337b3ac2ee1e9f34ab4cef1ee7cd27d39320d047 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -235,9 +235,16 @@ dnl ------------------------------------------------------------------------
 dnl search path for includes and libraries
 dnl ------------------------------------------------------------------------
 
+dnl VZ: added standard locations for Xm.h for Irix, HP-UX and SunOS (19.02.99)
 SEARCH_INCLUDE="\
+    /usr/Motif-1.2/include    \
+    /usr/Motif-2.1/include    \
+                              \
+    /usr/include/Motif1.2     \
+    /opt/xpm/include/X11      \
+                              \
     /usr/Motif1.2/include     \
-    /usr/dt/include/Xm        \
+    /usr/dt/include           \
                              \
     /usr/X11R6/include        \
     /usr/X11R5/include        \
@@ -279,19 +286,14 @@ SEARCH_INCLUDE="\
     /usr/lpp/Xamples/include  \
                               \
     /usr/local/include/gtk    \
-    /usr/local/include/Xm     \
     /usr/local/include/qt     \
-    /usr/X11R6/include/Xm     \
-    /usr/X11/include/Xm       \
     /usr/include/qt           \
                               \
     /usr/openwin/include      \
     /usr/openwin/share/include \
     "
 
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \
-    /usr/dt/lib \
-    "
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 
 dnl ------------------------------------------------------------------------
 dnl standard checks
@@ -447,7 +449,7 @@ AC_SUBST(GTK_JOYSTICK)
 dnl check for vprintf/vsprintf() which are GNU extensions
 AC_FUNC_VPRINTF
 dnl check for vsnprintf() which is another GNU extension
-AC_CHECK_FUNC(vsnprintf)
+AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF))
 
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -519,6 +521,7 @@ dnl   defines WORDS_BIGENDIAN if system is big endian
 AC_CHECK_SIZEOF(int *)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
 dnl   defines the size of certain types of variables in SIZEOF_???
 
 dnl ############################
@@ -1041,7 +1044,7 @@ fi
 
 if test "$wxUSE_MOTIF" = 1; then
    AC_MSG_CHECKING(for Motif/Lesstif includes)
-   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm.h)
+   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm/Xm.h)
    if test "$ac_find_includes" != "" ; then
      AC_MSG_RESULT(found $ac_find_includes)
      AC_MSG_CHECKING(for Motif/Lesstif library)
@@ -1192,7 +1195,7 @@ AC_SUBST(PNG_C_SRC)
 JPEG_LINK=""
 if test "$wxUSE_LIBJPEG" = 1 ; then
   AC_DEFINE_UNQUOTED(wxUSE_LIBJPEG,$wxUSE_LIBJPEG)
-  AC_HAVE_LIBRARY(jpeg) 
+  AC_CHECK_LIB(jpeg) 
   JPEG_LINK="-ljpeg"
 fi
 AC_SUBST(JPEG_LINK)