X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d51e8205da8e468adb5231ea8e1eeaa81567f42d..67cfebc2b6462a817bc71bb89d2cd0dc2d3ab3d6:/configure.in?ds=sidebyside diff --git a/configure.in b/configure.in index f2cfdbced7..70cf4d6e59 100644 --- a/configure.in +++ b/configure.in @@ -1445,8 +1445,12 @@ dnl ---------------------------------------------------------------- dnl search for toolkit (widget sets) dnl ---------------------------------------------------------------- +AFMINSTALL= + if test "$wxUSE_GUI" = "yes"; then +USE_GUI=1 + TOOLKIT= TOOLKIT_INCLUDE= @@ -1518,6 +1522,8 @@ dnl ) GUI_TK_LIBRARY="$GTK_LIBS -lgthread" TOOLKIT=GTK + AFMINSTALL=afminstall + GUIOBJS="\$(GTK_GUIOBJS)" GUIHEADERS="\$(GTK_HEADERS)" COMMONOBJS="\$(GTK_COMMONOBJS)" @@ -1598,6 +1604,8 @@ if test "$wxUSE_MOTIF" = 1; then GUI_TK_LIBRARY="$X_LIBS" TOOLKIT_INCLUDE="$X_CFLAGS" + AFMINSTALL=afminstall + dnl manual check for X11 headers/libs dnl dnl AC_MSG_CHECKING(for X11 headers) @@ -1704,7 +1712,7 @@ fi dnl the name of the directory where the files for this toolkit live if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"` else TOOLKIT_DIR="os2" fi @@ -1734,6 +1742,8 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}" else dnl leave all TOOLKIT_XXX vars empty + USE_GUI=0 + dnl the sources, their dependenices and the headers ALL_OBJECTS="\$(BASE_OBJS)" ALL_DEPFILES="\${BASE_DEPS}" @@ -3223,6 +3233,8 @@ dnl debugging options AC_SUBST(WXDEBUG_DEFINE) dnl toolkit options +AC_SUBST(USE_GUI) +AC_SUBST(AFMINSTALL) AC_SUBST(TOOLKIT) AC_SUBST(TOOLKIT_DEF) AC_SUBST(TOOLKIT_DIR)