X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c8183e2130d2015dcf9b0a68ab12b6bbbde4b8b..fae9f5903992726d533cb543878175f7c13ae0b1:/configure.in diff --git a/configure.in b/configure.in index fb4d81a1ef..b9f100bcdc 100644 --- a/configure.in +++ b/configure.in @@ -472,7 +472,7 @@ dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE) WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=3 -WX_RELEASE_NUMBER=0 +WX_RELEASE_NUMBER=1 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER @@ -2127,7 +2127,7 @@ if test "$wxUSE_SHARED" = "yes"; then WX_ALL="CREATE_LINKS" fi dnl add the resources target - WX_ALL="${WX_ALL} lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r" + WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r" dnl the name of the shared library WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib" WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib" @@ -2836,7 +2836,7 @@ if test "$wxUSE_THREADS" = "yes" ; then ] ) ]) - if test "$wx_cv_type_pthread_rec_mutex_init"="yes"; then + if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then AC_DEFINE(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER) else dnl this may break code working elsewhere, so at least warn about it @@ -3054,7 +3054,7 @@ fi TIFF_INCLUDE= if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then AC_DEFINE(wxUSE_LIBTIFF) - if test "$wxUSE_LIBTIFF" = "yes" ; then + if test "$wxUSE_LIBTIFF" = "yes" ; then TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" else TIFF_LINK= @@ -4177,12 +4177,12 @@ if test -d include; then if test -d include/wx; then if test -d include/wx/${TOOLKIT_DIR}; then if test -f include/wx/${TOOLKIT_DIR}/setup.h; then - mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h + mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h fi fi fi fi - + AC_CONFIG_HEADER(setup.h:setup.h.in) dnl some more GUI only things @@ -4212,10 +4212,10 @@ AC_OUTPUT([ chmod +x wx-config mv wx-config wx${TOOLKIT_NAME}-config ${LN_S} wx${TOOLKIT_NAME}-config wx-config - + dnl the debian build process wants setup.h in the lib subdir so we dnl can pretend wxWin is already installed, so we *copy* it there - + if test ! -d lib; then mkdir lib fi @@ -4249,7 +4249,7 @@ AC_OUTPUT([ if test -f setup.h; then cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h fi - + ], [ TOOLKIT_DIR="${TOOLKIT_DIR}"