/usr/X11R5/include \
/usr/X11R4/include \
\
+ /usr/X11R6/lib \
+ /usr/X11R5/lib \
+ /usr/X11R4/lib \
+ \
/usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
/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 \
DEFAULT_wxUSE_IOSTREAMH=1
DEFAULT_wxUSE_ZLIB=1
-DEFAULT_wxUSE_GDK_IMLIB=1
DEFAULT_wxUSE_LIBPNG=1
-DEFAULT_wxUSE_ODBC=1
+DEFAULT_wxUSE_ODBC=0
DEFAULT_wxUSE_COMBOBOX=1
DEFAULT_wxUSE_GAUGE=1
DEFAULT_wxUSE_METAFILE=0
DEFAULT_wxUSE_WXGRAPH=0
DEFAULT_wxUSE_WXTREE=0
-DEFAULT_wxUSE_HELP=0
+DEFAULT_wxUSE_HELP=1
DEFAULT_wxUSE_UNICODE=1
DEFAULT_wxUSE_WCSRTOMBS=0
**--with-zlib use zlib for LZW comression,
wxUSE_ZLIB)
-AC_OVERRIDES(gdk_imlib,gdk_imlib,
-**--with-gdk_imlib use Raster's gdk_imlib (Image library),
-wxUSE_GDK_IMLIB)
-
AC_OVERRIDES(libpng,libpng,
**--with-libpng use libpng (PNG image format),
wxUSE_LIBPNG)
**--with-printarch use printing architecture,
wxUSE_PRINTING_ARCHITECTURE)
+AC_OVERRIDES(help,help,
+**--with-help use help (using external browser at present),
+wxUSE_HELP)
+
dnl ----------------------------------------------------------------
dnl user options with no effect yet
dnl ----------------------------------------------------------------
dnl
dnl AC_OVERRIDES(metafile, metafile,
dnl **--with-metafile use metafile (no effect),
-dnl wxwxUSE_METAFILE)
-dnl
-dnl AC_OVERRIDES(help,help,
-dnl **--with-help use help (no effect),
-dnl wxwxUSE_HELP)
+dnl wxUSE_METAFILE)
dnl
dnl AC_OVERRIDES(wxgraph,wxgraph,
dnl **--with-wxgraph use wxgraph (no effect),
-dnl wxwxUSE_WXGRAPH)
+dnl wxUSE_WXGRAPH)
dnl
dnl AC_OVERRIDES(wxtree,wxtree,
dnl **--with-wxtree use wxtree (no effect),
-dnl wxwxUSE_WXTREE)
+dnl wxUSE_WXTREE)
dnl
dnl AC_OVERRIDES(package,message,helpmessage,variable)
dnl
GUI_TK_LIBRARY=
GUI_TK_LINK=
+WX_LINK=
+
MAKEINCLUDE=
if test "$wxUSE_GTK" = 1; then
- AM_PATH_GTK(0.99.7, [
+ AM_PATH_GTK(1.0.4, [
GUI_TK_INCLUDE="$GTK_CFLAGS"
GUI_TK_LIBRARY="$GTK_LIBS"
- ], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?))
+ ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4?))
TOOLKIT=GTK
TOOLKIT_DEF=__WXGTK__
+ WX_LINK=-lwx_gtk
MAKEINCLUDE=../gtk.inc
fi
else
AC_MSG_ERROR(no)
fi
- GUI_TK_LINK="-lXext -lX11 -lqt -lm"
+ GUI_TK_LINK="-lX11 -lqt -lm"
TOOLKIT=QT
TOOLKIT_DEF=__WXQT__
+ WX_LINK=-lwx_qt
MAKEINCLUDE=../qt.inc
fi
AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm.h)
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes)
- AC_MSG_CHECKING(for Motif or Lesstif library)
+ AC_MSG_CHECKING(for Motif/Lesstif library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm)
if test "$ac_find_libraries" != "" ; then
AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
- CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+ CHECK_LINK="$CHECK_LIB $ac_path_to_link"
CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
AC_MSG_RESULT(found at $ac_find_libraries)
+ AC_MSG_CHECKING(for Xt library)
+ AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
+ if test "$ac_find_libraries" != "" ; then
+ AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+ CHECK_LINK="$CHECK_LIB $ac_path_to_link"
+ AC_MSG_RESULT(found at $ac_find_libraries)
+ AC_MSG_CHECKING(for Xpm library)
+ AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
+ if test "$ac_find_libraries" != "" ; then
+ AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+ CHECK_LINK="$CHECK_LIB $ac_path_to_link"
+ AC_MSG_RESULT(found at $ac_find_libraries)
+ else
+ AC_MSG_ERROR(no)
+ fi
+ else
+ AC_MSG_ERROR(no)
+ fi
else
AC_MSG_ERROR(no)
fi
else
AC_MSG_ERROR(no)
fi
- GUI_TK_LINK="-lXext -lXt -lX11 -lXm -lm"
+ GUI_TK_LINK="-lXt -lXmu -lXpm -lX11 -lXm -lm"
+ GUI_TK_LINK="$CHECK_LINK $GUI_TK_LINK"
TOOLKIT=MOTIF
TOOLKIT_DEF=__WXMOTIF__
+ WX_LINK=-lwx_motif
MAKEINCLUDE=../motif.inc
fi
AC_SUBST(GUI_TK_LIBRARY)
AC_SUBST(GUI_TK_LINK)
+AC_SUBST(WX_LINK)
+
AC_SUBST(TOOLKIT)
AC_SUBST(TOOLKIT_DEF)
AC_DEFINE_UNQUOTED(WXDEBUG,$wxUSE_DEBUG_FLAG)
WXDEBUG_DEFINE="-D__WXDEBUG__"
AC_SUBST(WXDEBUG_DEFINE)
+else
+ WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+ AC_SUBST(WXDEBUG_DEFINE)
fi
if test "$wxUSE_MEM_TRACING" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
fi
-if test "$wxUSE_GDK_IMLIB" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_GDK_IMLIB,$wxUSE_GDK_IMLIB)
-fi
-
if test "$wxUSE_LIBPNG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG)
fi
+IODBC_C_SRC=""
if test "$wxUSE_ODBC" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC)
+ IODBC_C_SRC="\$(IODBC_C_SRC)"
fi
+AC_SUBST(IODBC_C_SRC)
dnl ----------------------------------------------------------------
dnl Register GUI-control options for makefiles and setup.h
dnl thread support
dnl ----------------------------------------------------------------
-wxwxUSE_THREADS=1
+wxUSE_THREADS=1
THREADS_LINK=""
UNIX_THREAD="gtk/threadno.cpp"
AC_OVERRIDES(threads,threads,
**--without-threads Force disabling threads,
-wxwxUSE_THREADS)
+wxUSE_THREADS)
dnl AC_ARG_WITH(threads,
dnl [**--without-threads Force disabling threads ],
-dnl [wxwxUSE_THREADS="$withval"])
+dnl [wxUSE_THREADS="$withval"])
-if test "$wxwxUSE_THREADS" = "1"; then
+if test "$wxUSE_THREADS" = "1"; then
UNIX_THREAD="gtk/threadno.cpp"
dnl For glibc 2 users who have the old libc 5 too
])
fi
+if test "$wxUSE_MOTIF" = "1"; then
+ UNIX_THREAD="motif/thread.cpp"
+fi
+
if test -z "$UNIX_THREAD"; then
- wxwxUSE_THREADS=0
+ wxUSE_THREADS=0
fi
AC_SUBST(UNIX_THREAD)
AC_SUBST(THREADS_LINK)
-AC_DEFINE(wxwxUSE_THREADS)
+AC_DEFINE(wxUSE_THREADS)
dnl defines UNIX_THREAD it contains the source file to use for threads. (GL)
dnl defines THREADS_LINK it contains the thread library to link with. (GL)
-dnl defines wxwxUSE_THREADS if thread support is activated. (GL)
+dnl defines wxUSE_THREADS if thread support is activated. (GL)
dnl ----------------------------------------------------------------
dnl search for opengl
case "${canonical}" in
*-hp-hpux* )
- if test "${CC}" != "gcc" ; then
+ if test "$GCC" != "yes" ; then
CXXFLAGS="${CXXFLAGS} +a1 -z -Aa -D_HPUX_SOURCE"
CFLAGS="${CFLAGS} -z -D_HPUX_SOURCE"
PICFLAGS="+z"
;;
*-*-solaris2* )
- if test "${CC}" != "gcc" ; then
+ if test "$GCC" != "yes" ; then
PICFLAGS="-KPIC"
else
PICFLAGS="-fPIC"
;;
*-*-sunos4* )
- if test "${CC}" != "gcc" ; then
+ if test "$GCC" != "yes" ; then
PICFLAGS="-PIC"
else
PICFLAGS="-fPIC"
;;
*-*-dgux5* )
- if test "${CC}" != "gcc" ; then
+ if test "$GCC" != "yes" ; then
PICFLAGS="-K PIC"
else
PICFLAGS="-fPIC"
;;
*-*-sysv5* )
- if test "${CC}" != "gcc" ; then
+ if test "$GCC" != "yes" ; then
PICFLAGS="-K PIC"
else
PICFLAGS="-fPIC"
;;
*-*-aix* )
- if test "${CC}" != "gcc" ; then
+ if test "$GCC" != "yes" ; then
PICFLAGS="-bM\:SRE"
else
PICFLAGS="-fPIC"
projects / wxWidgets.git / blobdiff