dnl $Id$
dnl ////////////////////////////////////////////////////////////////////////
+
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
AC_DEFUN(AM_PATH_GTK,
-[dnl
+[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
AC_ARG_WITH(gtk-prefix,[**--with-gtk-prefix=PFX Prefix where GTK is installed],
#include <gtk/gtk.h>
#include <stdio.h>
-int
+int
main ()
{
int major, minor, micro;
exit(1);
}
+ if (gtk_minor_version == 1) return FALSE;
+
return !((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
GTK_CFLAGS=""
if test $result = 0; then
ac_path_to_include=""
else
- ac_path_to_include="-I$1"
+ ac_path_to_include="-I$1"
fi
])
if test $result = 0; then
ac_path_to_link=""
else
- ac_path_to_link="-L$1"
+ ac_path_to_link="-L$1"
fi
])
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 \
+ /usr/include/Xm \
+ \
/usr/X11R6/include \
/usr/X11R5/include \
/usr/X11R4/include \
/usr/XFree86/include/X11 \
\
/usr/include \
+ /usr/include/gtk \
+ /usr/include/gdk \
+ /usr/include/glib \
/usr/local/include \
/usr/unsupported/include \
/usr/athena/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` \
- "
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
dnl ------------------------------------------------------------------------
dnl standard checks
dnl does compiler support -c and -o simultaniously
AC_PROG_CC_C_O
-dnl defines NO_MINUS_C_MINUS_O if compiler does not accept
+dnl defines NO_MINUS_C_MINUS_O if compiler does not accept
dnl both switches simultaniously
dnl what is the c-preprocessor
AC_PROG_CPP
AC_PROG_AWK
dnl defines AWK with the appropriate command
+dnl strip command
+dnl =============
+AC_CHECK_PROG(STRIP, strip, strip, true)
+dnl defines STRIP as strip or nothing if not found
+
dnl ###############
dnl # make checks #
dnl ###############
${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
RESULT=$?
rm -f sub/file check final_file confMake
-rmdir sub
+rmdir sub
if test "$RESULT" = 0; then
AC_MSG_RESULT(yes)
else
setenv MAKE gmake; ./configure for csh-type shells
Also please do remember to use gmake in this case every time
you are trying to compile.
-)
+)
fi
dnl ####################
dnl defines HAVE_SYS_TIME_H
AC_CHECK_HEADERS(unistd.h)
dnl defines HAVE_UNISTD_H
+AC_CHECK_HEADERS(wchar.h)
+dnl defines HAVE_WCHAR_H
+AC_CHECK_HEADERS(wcstr.h)
+dnl defines HAVE_WCSTR_H
AC_CHECK_HEADERS(fnmatch.h)
dnl defines HAVE_FNMATCH_H
dnl As it needs Linux 2.1.x for the moment: check whether the file exists (GL).
fi
AC_SUBST(GTK_JOYSTICK)
+dnl some systems (AIX) define some of string function in strings.h
+AC_CHECK_HEADERS(strings.h)
+
+dnl #######################
+dnl # check for functions #
+dnl #######################
+
+dnl check for wcslen
+AC_CHECK_LIB(c, wcslen, [
+ AC_DEFINE(HAVE_WCSLEN)
+ WCHAR_LINK=""
+ ], [
+ AC_CHECK_LIB(w, wcslen, [
+ AC_DEFINE(HAVE_WCSLEN)
+ WCHAR_LINK="-lw"
+ ])
+ ])
+AC_SUBST(WCHAR_LINK)
+
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_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_CHECK_HEADERS(iostream)
-if test "x$HAVE_IOSTREAM" = "x" ; then
- AC_DEFINE(wxUSE_IOSTREAMH)
-fi
-AC_LANG_RESTORE
+dnl check for vsnprintf() - a safe version of vsprintf()
+AC_CHECK_FUNCS(vsnprintf,
+ AC_DEFINE(HAVE_VSNPRINTF),
+ AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf)
+ )
+
+dnl check for vfork() (even if it's the same as fork() in modern Unices)
+AC_CHECK_FUNCS(vfork)
+
+POSIX4_LINK=
+AC_CHECK_FUNCS(nanosleep, AC_DEFINE(HAVE_NANOSLEEP), [
+ AC_CHECK_LIB(posix4, nanosleep, [
+ AC_DEFINE(HAVE_NANOSLEEP)
+ POSIX4_LINK="-lposix4"
+ ], [
+ AC_CHECK_FUNCS(usleep,
+ AC_DEFINE(HAVE_USLEEP),
+ AC_MSG_WARN(Sleep() function will not work))
+ ])
+])
+
+dnl check for uname (POSIX) and gethostname (BSD)
+AC_CHECK_FUNCS(uname gethostname, break)
-dnl defines HAVE_IOSTREAM
dnl ###################
dnl # checks typedefs #
dnl ###################
dnl #####################
AC_HEADER_STAT
-dnl defines STAT_MACROS_BROKEN if S_ISDIR and S_ISREG
+dnl defines STAT_MACROS_BROKEN if S_ISDIR and S_ISREG
dnl do not work properly
AC_HEADER_TIME
dnl defines TIME_WITH_SYS_TIME if time.h and sys/time.h can
dnl both be included
-AC_STRUCT_ST_BLKSIZE
+AC_STRUCT_ST_BLKSIZE
dnl defines HAVE_ST_BLKSIZE if struct stat contains st_blksize
-AC_STRUCT_ST_BLOCKS
+AC_STRUCT_ST_BLOCKS
dnl defines HAVE_ST_BLOCKS if struct stat contains st_blocks
-AC_STRUCT_ST_RDEV
+AC_STRUCT_ST_RDEV
dnl defines HAVE_ST_RDEV if struct stat contains st_rdev
AC_STRUCT_TM
dnl defines TM_IN_SYS_TIME if struct tm is not in time.h
dnl ###################################
dnl # checks compiler characteristics #
dnl ###################################
-dnl AC_C_CROSS
AC_C_CONST
dnl defines const to be empty if c-compiler does not support const fully
AC_C_BIGENDIAN
dnl defines WORDS_BIGENDIAN if system is big endian
-AC_CHECK_SIZEOF(int *)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-dnl defines the size of certain types of variables in SIZEOF_???
+dnl give some default values for cross-compiling
+AC_CHECK_SIZEOF(int *, 4)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(long long, 0)
+dnl defines the size of certain types of variables in SIZEOF_<TYPE>
+
+dnl ######################
+dnl # check C++ features #
+dnl ######################
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+dnl check for iostream (as opposed to iostream.h) standard header
+AC_CHECK_HEADERS(iostream)
+if test "x$HAVE_IOSTREAM" = "x" ; then
+ AC_DEFINE(wxUSE_IOSTREAMH)
+fi
+
+dnl Check for existence of builtin 'bool' data type
+dnl
+dnl do nothing for cross-compilation - assume bool is not defined
+AC_MSG_CHECKING(if C++ compiler supports bool)
+AC_TRY_RUN([
+
+int main()
+{
+ bool b = true;
+
+ return 0;
+}
+ ],
+ AC_DEFINE(HAVE_BOOL) AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no),
+ AC_MSG_RESULT(no assumed for cross-compilation))
+
+dnl Check whether overloading on size_t/int parameter works
+AC_MSG_CHECKING(if size_t and int are different types)
+AC_TRY_RUN([
+#include <stdlib.h>
+
+void wxFoo(int i) { }
+void wxFoo(size_t n) { }
+
+int main()
+{
+ int i;
+ size_t n;
+ wxFoo(0);
+ wxFoo(1);
+ wxFoo(0u);
+ wxFoo(i);
+ wxFoo(n);
+
+ return 0;
+}
+
+ ],
+ AC_DEFINE(wxUSE_SIZE_T_STRING_OPERATOR) AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no),
+ AC_MSG_RESULT(no assumed for cross-compilation))
+
+AC_LANG_RESTORE
dnl ############################
dnl # checks library functions #
dnl 14 chars are supported
dnl AC_SYS_RESTARTABLE_SYSCALLS
-dnl defines HAVE_RESTARTABLE_SYSCALLS if the system restarts a
+dnl defines HAVE_RESTARTABLE_SYSCALLS if the system restarts a
dnl system call that is interrupted
dnl by a signal
-
+
dnl #################
dnl # checks PARSER #
dnl #################
dnl what type is yytext
AC_DECL_YYTEXT
dnl defines YYTEXT_POINTER if yytext is char*
-dnl defines LEX_OUTPUT_ROOT as to the base of the
+dnl defines LEX_OUTPUT_ROOT as to the base of the
dnl filename output by the lexer
+dnl ###################################
+dnl ## Check for dynamic load module #
+dnl ###################################
+
+DL_LIBRARY=
+AC_CHECK_FUNCS(dlopen, AC_DEFINE(HAVE_LIBDL),
+[AC_CHECK_LIB(dl, dlopen, [AC_DEFINE(HAVE_LIBDL) DL_LIBRARY="-ldl"],
+ [AC_CHECK_LIB(dld, dld_link, [AC_DEFINE(HAVE_DLD) DL_LIBRARY="-ldld"],
+ [AC_CHECK_FUNCS(shl_load, AC_DEFINE(HAVE_SHL_LOAD) )]
+ )]
+ )]
+)
+AC_SUBST(DL_LIBRARY)
+
+AC_CACHE_CHECK([for underscore before symbols], libltdl_cv_uscore, [
+ echo "main(){int i=1;} fnord(){int i=23; int ltuae=42;}" > conftest.c
+ ${CC} -c conftest.c > /dev/null
+ if (nm conftest.o | grep _fnord) > /dev/null; then
+ libltdl_cv_uscore=yes
+ else
+ libltdl_cv_uscore=no
+ fi
+ rm -f conftest*
+])
+
+if test x"$libltdl_cv_uscore" = xyes; then
+ if test x"$ac_cv_func_dlopen" = xyes ||
+ test x"$ac_cv_lib_dl_dlopen" = xyes ; then
+ AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
+ libltdl_cv_need_uscore, [dnl
+ AC_TRY_RUN([
+#include <dlfcn.h>
+#include <stdio.h>
+fnord() { int i=42;}
+main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
+ if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
+ if(ptr1 && !ptr2) exit(0); } exit(1); }
+], libltdl_cv_need_uscore=no, libltdl_cv_need_uscore=yes,
+ libltdl_cv_need_uscore=no
+)])
+ fi
+fi
+
+if test x"$libltdl_cv_need_uscore" = xyes; then
+ AC_DEFINE(NEED_USCORE)
+fi
+
+dnl ##########################################
+dnl ## Check for specific library functions #
+dnl ##########################################
+
+dnl Checks for library functions.
+AC_CHECK_FUNCS(strerror)
+
dnl ------------------------------------------------------------------------
dnl main includes
dnl ------------------------------------------------------------------------
USE_UNIX=1
-
USE_LINUX=
USE_SGI=
USE_HPUX=
AC_DEFINE(__ALPHA__)
fi
;;
- *-*-irix5* | *-*-irix6* )
+ *-*-irix5* | *-*-irix6* )
USE_SGI=1
USE_SVR4=1
AC_DEFINE(__SGI__)
AC_DEFINE(__SVR4__)
;;
- *-*-solaris2* )
+ *-*-solaris2* )
USE_SUN=1
USE_SOLARIS=1
USE_SVR4=1
AC_DEFINE(__SOLARIS__)
AC_DEFINE(__SVR4__)
;;
- *-*-sunos4* )
+ *-*-sunos4* )
USE_SUN=1
USE_SUNOS=1
USE_BSD=1
AC_DEFINE(__FREEBSD__)
AC_DEFINE(__BSD__)
;;
- *-*-osf* )
+ *-*-osf* )
USE_ALPHA=1
USE_OSF=1
AC_DEFINE(__ALPHA__)
AC_DEFINE(__OSF__)
;;
- *-*-dgux5* )
+ *-*-dgux5* )
USE_ALPHA=1
USE_SVR4=1
AC_DEFINE(__ALPHA__)
AC_DEFINE(__SVR4__)
;;
- *-*-sysv5* )
+ *-*-sysv5* )
USE_SYSV=1
USE_SVR4=1
AC_DEFINE(__SYSV__)
AC_DEFINE(__SVR4__)
;;
- *-*-aix* )
+ *-*-aix* )
USE_AIX=1
USE_SYSV=1
USE_SVR4=1
DEFAULT_wxUSE_QT=0
DEFAULT_wxUSE_MOTIF=0
-DEFAULT_wxUSE_THREADS=1
+DEFAULT_wxUSE_THREADS=0
DEFAULT_wxUSE_SHARED=1
DEFAULT_wxUSE_OPTIMISE=1
DEFAULT_wxUSE_ZLIB=1
DEFAULT_wxUSE_LIBPNG=1
-DEFAULT_wxUSE_ODBC=0
-
-DEFAULT_wxUSE_COMBOBOX=1
-DEFAULT_wxUSE_GAUGE=1
-DEFAULT_wxUSE_SCROLLBAR=1
-DEFAULT_wxUSE_LISTCTRL=1
-DEFAULT_wxUSE_TREECTRL=1
-DEFAULT_wxUSE_GRID=1
-DEFAULT_wxUSE_TAB_DIALOG=1
-DEFAULT_wxUSE_NOTEBOOK=1
+DEFAULT_wxUSE_LIBJPEG=1
+DEFAULT_wxUSE_ODBC=1
DEFAULT_wxUSE_TIMEDATE=1
-DEFAULT_wxUSE_FRACTION=1
-DEFAULT_wxUSE_LOG=1
DEFAULT_wxUSE_INTL=1
DEFAULT_wxUSE_CONFIG=1
DEFAULT_wxUSE_STREAMS=1
+DEFAULT_wxUSE_SOCKETS=1
DEFAULT_wxUSE_SERIAL=1
-DEFAULT_wxUSE_FILE=1
-DEFAULT_wxUSE_TEXTFILE=1
+DEFAULT_wxUSE_DYNLIB_CLASS=1
DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
DEFAULT_WX_NORMALIZED_PS_FONTS=1
DEFAULT_wxUSE_IPC=1
DEFAULT_wxUSE_RESOURCES=1
-DEFAULT_wxUSE_CONSTRAINTS=1
DEFAULT_wxUSE_CLIPBOARD=1
-DEFAULT_wxUSE_DND=1
+DEFAULT_wxUSE_TOOLTIPS=1
+DEFAULT_wxUSE_DRAG_AND_DROP=1
DEFAULT_wxUSE_MDI_ARCHITECTURE=1
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
DEFAULT_wxUSE_PROLOGIO=1
DEFAULT_wxUSE_WX_RESOURCES=1
DEFAULT_wxUSE_RPC=0
-
-DEFAULT_wxUSE_OPENGL=0
-DEFAULT_wxUSE_METAFILE=0
-DEFAULT_wxUSE_WXGRAPH=0
-DEFAULT_wxUSE_WXTREE=0
DEFAULT_wxUSE_HELP=1
-DEFAULT_wxUSE_UNICODE=1
+DEFAULT_wxUSE_UNICODE=0
DEFAULT_wxUSE_WCSRTOMBS=0
dnl ----------------------------------------------------------------
**--with_apple_ieee use the Apple IEEE codec,
wxUSE_APPLE_IEEE)
+AC_OVERRIDES(threads,threads,
+**--with-threads for enabling threads,
+wxUSE_THREADS)
+
+AC_OVERRIDES(dynlib,dynlib,
+**--with-dynlib to compile wxLibrary class,
+wxUSE_DYNLIB_CLASS)
+
dnl ----------------------------------------------------------------
dnl user options for libraries
dnl ----------------------------------------------------------------
AC_OVERRIDES(zlib,zlib,
-**--with-zlib use zlib for LZW comression,
+**--without-zlib don't use zlib for LZW comression,
wxUSE_ZLIB)
AC_OVERRIDES(libpng,libpng,
-**--with-libpng use libpng (PNG image format),
+**--without-libpng don't use libpng (PNG image format),
wxUSE_LIBPNG)
+AC_OVERRIDES(libjpeg,libjpeg,
+**--without-libjpeg don't use libjpeg (JPEG image format),
+wxUSE_LIBJPEG)
+
AC_OVERRIDES(odbc,odbc,
**--with-odbc use iODBC and wxODBC classes,
wxUSE_ODBC)
-AC_OVERRIDES(opengl,opengl,
-**--with-opengl use OpenGL (or Mesa),
-wxUSE_OPENGL)
-
-dnl ----------------------------------------------------------------
-dnl user options for GUI control classes
-dnl ----------------------------------------------------------------
-
-AC_OVERRIDES(gauge,gauge,
-**--with-gauge use wxGauge class,
-wxUSE_GAUGE)
-
-AC_OVERRIDES(combobox,combobox,
-**--with-combobox use wxComboBox class,
-wxUSE_COMBOBOX)
-
-AC_OVERRIDES(scrollbar,scrollbar,
-**--with-scrollbar use wxScrollbar class,
-wxUSE_SCROLLBAR)
-
-AC_OVERRIDES(listctrl,listctrl,
-**--with-listctrl use wxListCtrl class,
-wxUSE_LISTCTRL)
-
-AC_OVERRIDES(treectrl,treectrl,
-**--with-treectrl use wxTreeCtrl class,
-wxUSE_TREECTRL)
-
-AC_OVERRIDES(grid,grid,
-**--with-grid use wxGrid class,
-wxUSE_GRID)
-
-AC_OVERRIDES(tab_dialog,tab_dialog,
-**--with-tab_dialog use wxTabDia class,
-wxUSE_TAB_DIALOG)
-
-AC_OVERRIDES(notebook,notebook,
-**--with-notebook use wxNotebook class,
-wxUSE_NOTEBOOK)
-
dnl ----------------------------------------------------------------
dnl user options for non-GUI classes
dnl ----------------------------------------------------------------
**--with-timedate use wxTime and wxDate classes,
wxUSE_TIMEDATE)
-AC_OVERRIDES(fraction,fraction,
-**--with-fraction use wxFraction class,
-wxUSE_FRACTION)
-
-AC_OVERRIDES(log,log,
-**--with-log use logging system,
-wxUSE_LOG)
-
AC_OVERRIDES(intl,intl,
**--with-intl use internationalization system,
wxUSE_INTL)
**--with-serial use class serialization,
wxUSE_SERIAL)
-AC_OVERRIDES(file,file,
-**--with-file use wxFile class,
-wxUSE_FILE)
-
-AC_OVERRIDES(textfile,textfile,
-**--with-textfile use wxTextFile class,
-wxUSE_TEXTFILE)
+AC_OVERRIDES(sockets,sockets,
+**--with-sockets use wxSocket etc classes,
+wxUSE_SOCKETS)
dnl ----------------------------------------------------------------
dnl user options for PostScript
**--with-clipboard use wxClipboard classes,
wxUSE_CLIPBOARD)
+AC_OVERRIDES(tooltips,tooltips,
+**--with-tooltips use tooltips,
+wxUSE_TOOLTIPS)
+
AC_OVERRIDES(dnd,dnd,
**--with-dnd use Drag'n'Drop classes,
-wxUSE_DND)
-
-AC_OVERRIDES(constraints,constrains,
-**--with-constraints use layout-constraints system,
-wxUSE_CONSTRAINTS)
+wxUSE_DRAG_AND_DROP)
dnl ----------------------------------------------------------------
dnl user options for architectures
**--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 wxUSE_METAFILE)
-dnl
-dnl AC_OVERRIDES(wxgraph,wxgraph,
-dnl **--with-wxgraph use wxgraph (no effect),
-dnl wxUSE_WXGRAPH)
-dnl
-dnl AC_OVERRIDES(wxtree,wxtree,
-dnl **--with-wxtree use wxtree (no effect),
-dnl wxUSE_WXTREE)
-dnl
-dnl AC_OVERRIDES(package,message,helpmessage,variable)
-dnl
dnl ----------------------------------------------------------------
dnl Unix, obviously
dnl ----------------------------------------------------------------
AC_DEFINE(__UNIX__)
fi
+dnl ----------------------------------------------------------------
+dnl Linux: test for libc5/glibc2: glibc2 has gettext() included
+dnl ----------------------------------------------------------------
+if test "$USE_LINUX" = 1; then
+ AC_CHECK_LIB(c,gettext,AC_DEFINE(wxHAVE_GLIBC2))
+fi
+
dnl ----------------------------------------------------------------
dnl search for toolkit (widget sets)
dnl ----------------------------------------------------------------
MAKEINCLUDE=
+WXGTK12=
+
if test "$wxUSE_GTK" = 1; then
- AM_PATH_GTK(1.0.4, [
+ AM_PATH_GTK(1.0.0, [
GUI_TK_INCLUDE="$GTK_CFLAGS"
GUI_TK_LIBRARY="$GTK_LIBS"
- ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4?))
+ ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?))
TOOLKIT=GTK
TOOLKIT_DEF=__WXGTK__
- WX_LINK=-lwx_gtk_1_0
+ WX_LINK=-lwx_gtk2
MAKEINCLUDE=../gtk.inc
+ AM_PATH_GTK(1.2.0, [
+ WXGTK12=1
+ ])
fi
if test "$wxUSE_QT" = 1; then
fi
if test "$wxUSE_MOTIF" = 1; then
- AC_MSG_CHECKING(for Motif/Lesstif includes)
- 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/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_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="-lXm -lXmu -lXt -lXpm -lX11 -lm"
- GUI_TK_LINK="$CHECK_LINK $GUI_TK_LINK"
- TOOLKIT=MOTIF
- TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"
- WX_LINK=-lwx_motif
- MAKEINCLUDE=../motif.inc
+ AC_MSG_CHECKING(for Motif/Lesstif includes)
+ AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
+ if test "$ac_find_includes" != "" ; then
+ AC_MSG_RESULT(found $ac_find_includes)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(please set CFLAGS to contain the location of Xm/Xm.h)
+ fi
+
+ 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_LIB $ac_path_to_link"
+ CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+ AC_MSG_RESULT(found at $ac_find_libraries)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm)
+ fi
+
+ 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)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(please set LDFLAGS to contain the location of libXt)
+ fi
+
+ XPM_LINK=""
+ 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"
+ XPM_LINK="-lXpm "
+ AC_DEFINE(wxHAVE_LIB_XPM)
+ AC_MSG_RESULT(found at $ac_find_libraries)
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN(library will be compiled without support for images in XPM format)
+ fi
+
+ GUI_TK_LINK="-lXm $(XPM_LINK)-lXmu -lXt -lX11 -lm"
+ GUI_TK_LIBRARY="$CHECK_LIB $GUI_TK_LINK"
+ TOOLKIT=MOTIF
+ TOOLKIT_DEF=__WXMOTIF__
+ WX_LINK=-lwx_motif2
+ MAKEINCLUDE=../motif.inc
fi
if test "$TOOLKIT" = ""; then
- AC_MSG_ERROR(You must specify a toolkit: --with-gtk --with-qt --with-motif)
+ AC_MSG_ERROR(You must specify a toolkit: --with-gtk --with-qt --with-motif)
fi
AC_SUBST(GUI_TK_INCLUDE)
dnl Register compile options for makefiles and setup.h
dnl ----------------------------------------------------------------
+if test "$WXGTK12" = 1 ; then
+ AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
+fi
+
+EXTRA_LINK=
+
WXDEBUG=
if test "$wxUSE_DEBUG_GDB" = 1 ; then
- wxUSE_DEBUG_INFO=1
- WXDEBUG="-ggdb"
- wxUSE_OPTIMISE=0
-else
- if test "$wxUSE_DEBUG_INFO" = 1 ; then
+ wxUSE_DEBUG_INFO=1
+ WXDEBUG="-ggdb"
+fi
+
+if test "$wxUSE_DEBUG_INFO" = 1 ; then
WXDEBUG="-g"
wxUSE_OPTIMISE=0
- fi
fi
+
AC_SUBST(WXDEBUG)
if test "$wxUSE_DEBUG_FLAG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_GLOBAL_MEMORY_OPERATORS,$wxUSE_MEM_TRACING)
fi
-EXTRA_LINK=
if test "$wxUSE_DMALLOC" = 1 ; then
EXTRA_LINK="$EXTRA_LINK -ldmalloc"
fi
if test "$wxUSE_ZLIB" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
+ Z_C_SRC="\$(Z_C_SRC)"
fi
+AC_SUBST(Z_C_SRC)
if test "$wxUSE_LIBPNG" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG)
+ AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG)
+ PNG_C_SRC="\$(PNG_C_SRC)"
+fi
+AC_SUBST(PNG_C_SRC)
+
+if test "$wxUSE_LIBJPEG" = 1 ; then
+ AC_DEFINE_UNQUOTED(wxUSE_LIBJPEG,$wxUSE_LIBJPEG)
+ JPEG_C_SRC="\$(JPEG_C_SRC)"
fi
+AC_SUBST(JPEG_C_SRC)
+
+JPEG_LINK=""
+dnl if test "$wxUSE_LIBJPEG" = 1 ; then
+dnl AC_DEFINE_UNQUOTED(wxUSE_LIBJPEG,$wxUSE_LIBJPEG)
+dnl AC_CHECK_LIB(jpeg,main,,AC_MSG_ERROR("libjpeg is not available."))
+dnl JPEG_LINK="-ljpeg"
+dnl fi
+AC_SUBST(JPEG_LINK)
IODBC_C_SRC=""
if test "$wxUSE_ODBC" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC)
+ 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 ----------------------------------------------------------------
-if test "$wxUSE_GAUGE" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_GAUGE,$wxUSE_GAUGE)
-fi
-
-if test "$wxUSE_COMBOBOX" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_COMBOBOX,$wxUSE_COMBOBOX)
-fi
+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 wxUSE_THREADS if thread support is activated. (GL)
-if test "$wxUSE_SCROLLBAR" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_SCROLLBAR,$wxUSE_SCROLLBAR)
-fi
+THREADS_LINK=""
+UNIX_THREAD=""
-if test "$wxUSE_LISTCTRL" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_LISTCTRL,$wxUSE_LISTCTRL)
+if test "$wxUSE_THREADS" = "1"; then
+ dnl find if POSIX threads are available
+
+ dnl standard lib name is pthread
+ dnl We no longer test for pthread-0.7 as it breaks compilation on some
+ dnl glibc2 systems, especially for static linkage.
+ AC_CHECK_LIB(pthread, pthread_create, [
+ UNIX_THREAD="unix/threadpsx.cpp"
+ THREADS_LINK="pthread"
+ ], [
+ dnl thread functions are in libc_r under FreeBSD
+ AC_CHECK_LIB(c_r, pthread_create, [
+ UNIX_THREAD="unix/threadpsx.cpp"
+ THREADS_LINK="c_r"
+ ], [
+ dnl VZ: SGI threads are not supported currently
+ AC_CHECK_HEADER(sys/prctl.h, [
+ UNIX_THREAD="gtk/threadsgi.cpp"
+ ])
+ ])
+ ])
+ if test "$THREADS_LINK" != ""; then
+ AC_DEFINE(wxUSE_THREADS)
+ else
+ AC_MSG_WARN(No thread support on this system)
+ fi
fi
-if test "$wxUSE_TREECTRL" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_TREECTRL,$wxUSE_TREECTRL)
+if test -z "$UNIX_THREAD"; then
+ wxUSE_THREADS=0
fi
-if test "$wxUSE_GRID" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_GRID,$wxUSE_GRID)
-fi
+dnl do other tests only if we are using threads
+if test "$wxUSE_THREADS" = "1"; then
-if test "$wxUSE_TAB_DIALOG" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_TAB_DIALOG,$wxUSE_TAB_DIALOG)
+ dnl define autoconf macro to check for given function in both pthread and
+ dnl posix4 libraries
+ dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)
+ dnl VZ: TODO
+ dnl AC_DEFUN(AC_FUNC_THREAD,
+ dnl [
+ dnl AC_CHECK_LIB($THREADS_LINK, $1,
+ dnl AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'),
+ dnl [AC_CHECK_LIB("posix4", $1,
+ dnl [AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'))
+ dnl POSIX4_LINK="-lposix4"
+ dnl ])
+ dnl ])
+ dnl ])
+
+ AC_CHECK_HEADERS(sched.h)
+
+ AC_CHECK_LIB($THREADS_LINK, sched_yield,
+ AC_DEFINE(HAVE_SCHED_YIELD),
+ [AC_CHECK_LIB("posix4", sched_yield,
+ [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK="-lposix4"],
+ AC_MSG_WARN(wxThread::Yield() will not work properly)
+ )]
+ )
+
+ dnl VZ: we should be checking for all of the following functions instead:
+ dnl 1. pthread_attr_getschedpolicy
+ dnl 2. sched_get_priority_min and sched_get_priority_max
+ dnl 3. pthread_attr_getschedparam and pthread_attr_setschedparam
+ dnl but it seems that if the first one is there, the other ones are too (of
+ dnl course the proper solution would be to implement AC_FUNC_THREAD above
+ dnl and do test for them all - anyone?)
+ AC_CHECK_LIB($THREADS_LINK, pthread_attr_getschedpolicy,
+ AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS),
+ [AC_CHECK_LIB("posix4", pthread_attr_getschedpolicy,
+ [AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS) POSIX4_LINK="-lposix4"],
+ AC_MSG_WARN(Setting thread priority will not work)
+ )]
+ )
+
+ AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
+ AC_DEFINE(HAVE_PTHREAD_CANCEL),
+ AC_MSG_WARN(wxThread::Kill() will not work properly))
+
+ THREADS_LINK="-l$THREADS_LINK"
fi
-if test "$wxUSE_NOTEBOOK" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_NOTEBOOK,$wxUSE_NOTEBOOK)
-fi
+AC_SUBST(UNIX_THREAD)
+AC_SUBST(THREADS_LINK)
+AC_SUBST(POSIX4_LINK)
dnl ----------------------------------------------------------------
dnl Register non-GUI class options for makefiles and setup.h
AC_DEFINE_UNQUOTED(wxUSE_TIMEDATE,$wxUSE_TIMEDATE)
fi
-if test "$wxUSE_FRACTION" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_FRACTION,$wxUSE_FRACTION)
-fi
-
-if test "$wxUSE_LOG" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_LOG,$wxUSE_LOG)
-fi
-
if test "$wxUSE_INTL" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_INTL,$wxUSE_INTL)
fi
AC_DEFINE_UNQUOTED(wxUSE_STREAMS,$wxUSE_STREAMS)
fi
+if test "$wxUSE_SOCKETS" = 1 ; then
+ if test "$wxUSE_THREADS" = 1 ; then
+ AC_DEFINE_UNQUOTED(wxUSE_SOCKETS,$wxUSE_SOCKETS)
+ else
+ AC_MSG_WARN(sockets or only supported with threads)
+ wxUSE_SOCKETS=0
+ fi
+fi
+
if test "$wxUSE_SERIAL" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)
fi
-if test "$wxUSE_FILE" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_FILE,$wxUSE_FILE)
+dnl ------------------------------------------------------------------------
+dnl wxSocket
+dnl ------------------------------------------------------------------------
+
+if test "$wxUSE_SOCKETS" = "1"; then
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ dnl determine the type of third argument for getsockname
+ AC_MSG_CHECKING(the type of the third argument of getsockname)
+ AC_TRY_COMPILE(
+ [#include <sys/socket.h>],
+ [socklen_t len; getsockname(0, NULL, &len);],
+ AC_DEFINE(SOCKLEN_T, socklen_t) AC_MSG_RESULT(socklen_t),
+ AC_TRY_COMPILE(
+ [#include <sys/socket.h>],
+ [size_t len; getsockname(0, NULL, &len);],
+ AC_DEFINE(SOCKLEN_T, size_t) AC_MSG_RESULT(size_t),
+ AC_TRY_COMPILE(
+ [#include <sys/socket.h>],
+ [int len; getsockname(0, NULL, &len);],
+ AC_DEFINE(SOCKLEN_T, int) AC_MSG_RESULT(int),
+ AC_MSG_RESULT(unknown)
+ )
+ )
+ )
+ AC_LANG_RESTORE
+fi
+
+dnl ------------------------------------------------------------------------
+dnl wxLibrary class
+dnl ------------------------------------------------------------------------
+
+HAVE_DL_FUNCS=0
+if test "$wxUSE_DYNLIB_CLASS" = "1"; then
+ dnl the test is a bit complicated because we check for dlopen() both with
+ dnl and without -ldl
+ AC_CHECK_FUNCS(dlopen,
+ [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1],
+ [AC_CHECK_LIB(dl, dlopen,
+ [AC_DEFINE(HAVE_DLOPEN) HAVE_DL_FUNCS=1])])
+ AC_CHECK_FUNCS(shl_load, [AC_DEFINE(HAVE_SHL_LOAD) HAVE_DL_FUNCS=1])
+
+ if test "$HAVE_DL_FUNCS" = 0; then
+ AC_MSG_WARN("--with-dynlib will be disabled because no function was found to load a shared library on this platform")
+
+ wxUSE_DYNLIB_CLASS=0
+ fi
fi
-if test "$wxUSE_TEXTFILE" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_TEXTFILE,$wxUSE_TEXTFILE)
+if test "$wxUSE_DYNLIB_CLASS" = 1 ; then
+ AC_DEFINE_UNQUOTED(wxUSE_DYNLIB_CLASS,$wxUSE_DYNLIB_CLASS)
fi
dnl ----------------------------------------------------------------
AC_DEFINE_UNQUOTED(wxUSE_CLIPBOARD,$wxUSE_CLIPBOARD)
fi
-if test "$wxUSE_DND" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_DND,$wxUSE_DND)
+if test "$wxUSE_TOOLTIPS" = 1 ; then
+ if test "$wxUSE_MOTIF" = 1; then
+ AC_MSG_WARN(tooltips are not supported yet under Motif)
+ wxUSE_TOOLTIPS=0
+ fi
+ AC_DEFINE_UNQUOTED(wxUSE_TOOLTIPS,$wxUSE_TOOLTIPS)
fi
-if test "$wxUSE_CONSTRAINTS" = 1 ; then
- AC_DEFINE_UNQUOTED(wxUSE_CONSTRAINTS,$wxUSE_CONSTRAINTS)
+if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
+ if test "$WXGTK12" = 1 ; then
+ AC_DEFINE_UNQUOTED(wxUSE_DRAG_AND_DROP,$wxUSE_DRAG_AND_DROP)
+ else
+ AC_MSG_WARN(drag and drop is only supported under GTK 1.2)
+ wxUSE_DRAG_AND_DROP=0
+ fi
fi
dnl ----------------------------------------------------------------
-dnl No effect
+dnl No effect yet
dnl ----------------------------------------------------------------
-METAFILE=NONE
-if test "$wxUSE_METAFILE" = 1 ; then
- METAFILE="METAFILE"
- AC_DEFINE_UNQUOTED(wxUSE_METAFILE,$wxUSE_METAFILE)
-fi
-AC_SUBST(METAFILE)
-
HELP=NONE
if test "$wxUSE_HELP" = 1 ; then
HELP="HELP"
fi
AC_SUBST(HELP)
-WXGRAPH=NONE
-if test "$wxUSE_WXGRAPH" = 1 ; then
- WXGRAPH="WXGRAPH"
- AC_DEFINE_UNQUOTED(wxUSE_WXGRAPH,$wxUSE_WXGRAPH)
-fi
-AC_SUBST(WXGRAPH)
-
-WXTREE=NONE
-if test "$wxUSE_WXTREE" = 1 ; then
- WXTREE="WXTREE"
- AC_DEFINE_UNQUOTED(wxUSE_WXTREE,$wxUSE_WXTREE)
-fi
-AC_SUBST(WXTREE)
-
-GLCANVAS=NONE
-if test "$wxUSE_OPENGL" = 1 ; then
- GLCANVAS="GLCANVAS"
-fi
-
-dnl ----------------------------------------------------------------
-dnl select dynamic loader (used by iODBC to load drivers)
-dnl ----------------------------------------------------------------
-
-AC_CHECK_LIB(dl,main,[DL_LIBRARY=-ldl],[DL_LIBRARY=])
-AC_SUBST(DL_LIBRARY)
-
-dnl ----------------------------------------------------------------
-dnl thread support
-dnl ----------------------------------------------------------------
-
-wxUSE_THREADS=1
-THREADS_LINK=""
-UNIX_THREAD="gtk/threadno.cpp"
-
-AC_OVERRIDES(threads,threads,
-**--without-threads Force disabling threads,
-wxUSE_THREADS)
-
-dnl AC_ARG_WITH(threads,
-dnl [**--without-threads Force disabling threads ],
-dnl [wxUSE_THREADS="$withval"])
-
-if test "$wxUSE_THREADS" = "1"; then
- UNIX_THREAD="gtk/threadno.cpp"
-
- dnl For glibc 2 users who have the old libc 5 too
-
- AC_CHECK_LIB(pthread-0.7, pthread_create, [
- UNIX_THREAD="gtk/threadpsx.cpp"
- THREADS_LINK="-lpthread-0.7"
- ],[
- AC_CHECK_HEADER(sys/prctl.h, [
- UNIX_THREAD="gtk/threadsgi.cpp"
- ])
-
- dnl pthread_create is always available in pthread but it seems not to be
- dnl the case for pthread_setcanceltype.
-
- AC_CHECK_LIB(pthread, pthread_setcanceltype, [
- UNIX_THREAD="gtk/threadpsx.cpp"
- THREADS_LINK="-lpthread"
- ])
- ])
- AC_CHECK_LIB(pthreads, pthread_setcanceltype, [
- UNIX_THREAD="gtk/threadpsx.cpp"
- THREADS_LINK="-lpthreads"
- ])
-fi
-
-if test "$wxUSE_MOTIF" = "1"; then
- UNIX_THREAD="motif/thread.cpp"
-fi
-
-if test -z "$UNIX_THREAD"; then
- wxUSE_THREADS=0
-fi
-
-AC_SUBST(UNIX_THREAD)
-AC_SUBST(THREADS_LINK)
-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 wxUSE_THREADS if thread support is activated. (GL)
-
-dnl ----------------------------------------------------------------
-dnl search for opengl
-dnl ----------------------------------------------------------------
-
-OPENGL_INCLUDE=
-OPENGL_LIBRARY=
-OPENGL_LINK=
-
-if test "$wxUSE_OPENGL" = 1; then
- dnl checking OPENGL includes
- AC_MSG_CHECKING(for OpenGL includes)
- AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,GL/gl.h)
- if test "$ac_find_includes" != "" ; then
- OPENGL_INCLUDE="-I$ac_find_includes"
- AC_MSG_RESULT(found $ac_find_includes)
- dnl checking OPENGL libraries
- AC_MSG_CHECKING(for OpenGL library)
- AC_PATH_FIND_LIBRARIES($SEARCH_LIB,GL)
- 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_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
- OPENGL_LIBRARY="$ac_path_to_link"
- OPENGL_INCLUDE="$ac_path_to_include"
- OPENGL_LINK="-lGL"
- AC_MSG_RESULT(found OpenGL at $ac_find_libraries)
- else
- AC_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
- 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_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
- OPENGL_LIBRARY="$ac_path_to_link"
- OPENGL_INCLUDE="$ac_path_to_include"
- OPENGL_LINK="-lMesaGL"
- AC_MSG_RESULT(found MESA at $ac_find_libraries)
- else
- AC_MSG_ERROR(no)
- fi
- fi
- else
- AC_MSG_ERROR(no)
- fi
-fi
-
-dnl ----------------------------------------------------------------
-dnl left-over
-dnl ----------------------------------------------------------------
-
-wxUSE_GLX=$wxUSE_OPENGL
-if test "$wxUSE_OPENGL" != 1; then
- OPENGL_LIBRARIES=
- OPENGL_INCLUDE=
- OPENGL_LINK=
- GLCANVAS=NONE
-fi
-
-AC_DEFINE_UNQUOTED(wxUSE_GLX,$wxUSE_GLX)
-AC_SUBST(OPENGL_INCLUDE)
-AC_SUBST(OPENGL_LIBRARY)
-AC_SUBST(OPENGL_LINK)
-AC_SUBST(GLCANVAS)
-
dnl ------------------------------------------------------------------------
dnl compiler options for shared libs
dnl ------------------------------------------------------------------------
PICFLAGS=
CREATE_SHARED=
case "${canonical}" in
-
*-hp-hpux* )
if test "$GCC" != "yes" ; then
CXXFLAGS="${CXXFLAGS} +a1 -z -Aa -D_HPUX_SOURCE"
CREATE_SHARED=sharedLinux
;;
- *-*-irix5* | *-*-irix6* )
+ *-*-irix5* | *-*-irix6* )
# PICFLAGS can remain empty, as pic is the default
LDFLAGS="-Wl,+s"
CREATE_SHARED=sharedIrix
AC_DEFINE(SVR4)
;;
- *-*-solaris2* )
+ *-*-solaris2* )
if test "$GCC" != "yes" ; then
PICFLAGS="-KPIC"
else
AC_DEFINE(SVR4)
;;
- *-*-sunos4* )
+ *-*-sunos4* )
if test "$GCC" != "yes" ; then
PICFLAGS="-PIC"
else
AC_DEFINE(BSD)
;;
- *-*-osf* )
+ *-*-osf* )
PICFLAGS="-fPIC"
CREATE_SHARED=sharedOSF
;;
- *-*-dgux5* )
+ *-*-dgux5* )
if test "$GCC" != "yes" ; then
PICFLAGS="-K PIC"
else
AC_DEFINE(SVR4)
;;
- *-*-sysv5* )
+ *-*-sysv5* )
if test "$GCC" != "yes" ; then
PICFLAGS="-K PIC"
else
AC_DEFINE(SVR4)
;;
- *-*-aix* )
+ *-*-aix* )
if test "$GCC" != "yes" ; then
PICFLAGS="-bM\:SRE"
else
- PICFLAGS="-fPIC"
+ PICFLAGS="-fPIC -D__SYSV__"
fi
CREATE_SHARED=sharedAIX
AC_DEFINE(SYSV)
esac
if test "x$GCC" = xyes; then
- CFLAGS="${CFLAGS} -Wall"
+ CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-uninitialized -D_REENTRANT -DLEX_SCANNER -DHAVE_LIBDL"
fi
if test "x$GXX" = xyes; then
if test "$wxUSE_MOTIF" = 1; then
- CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused"
+ CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"
else
- CXXFLAGS="${CXXFLAGS} -Wall"
+ CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"
fi
fi
dnl add OS to list of configured
echo $OS >> system.list
-AC_CONFIG_HEADER(./include/wx/gtk/setup.h:./setup/setup.hin)
+TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
+AC_CONFIG_HEADER(./include/wx/${TOOLKIT_DIR}/setup.h:./setup/setup.hin)
+
AC_OUTPUT(./setup/substit ./wx-config:./wx-config.in,./setup/general/createall)
AC_OVERRIDES_DONE
+
projects / wxWidgets.git / blobdiff