X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a60a58a73e1e724b2449cda6d08135704e9c6eb..450d55a035d90e211026a51eb2072d55f5a738a3:/configure.in diff --git a/configure.in b/configure.in index 560b267978..0f65fc66ee 100644 --- a/configure.in +++ b/configure.in @@ -165,9 +165,8 @@ case "${host}" in fi DEFAULT_DEFAULT_wxUSE_GTK=1 ;; - *-*-gnu* ) + *-*-gnu* | *-*-k*bsd*-gnu ) USE_GNU=1 - AC_DEFINE(__GNU__) TMP=`uname -m` if test "x$TMP" = "xalpha"; then USE_ALPHA=1 @@ -295,7 +294,7 @@ case "${host}" in DEFAULT_DEFAULT_wxUSE_PM=1 dnl "c++" wrapper is not always available, so always use plain gcc. CXX=gcc - LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals" + LDFLAGS="$LDFLAGS -Zcrtdll" dnl dnl Some special code that's automatically added by autoconf-2.57 for OS/2 dnl and hopefully also by autoconf-2.58 and newer on all other platforms. @@ -481,7 +480,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_GZSTREAM=no DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no @@ -664,7 +662,6 @@ else DEFAULT_wxUSE_FS_ZIP=yes DEFAULT_wxUSE_BUSYINFO=yes DEFAULT_wxUSE_ZIPSTREAM=yes - DEFAULT_wxUSE_GZSTREAM=yes DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes @@ -676,7 +673,7 @@ else DEFAULT_wxUSE_CHECKLST=yes DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_DISPLAY=no + DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -773,6 +770,7 @@ AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$wit WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX) WX_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)], wxUSE_GTK2) +WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE) WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG) WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG) @@ -799,6 +797,9 @@ WX_ARG_ENABLE(shared, [ --enable-shared create shared library code WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL) +if test "$USE_OS2" = "1"; then + WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF) +fi if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes @@ -880,7 +881,6 @@ WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Un WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND) WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM) -WX_ARG_ENABLE(gzstream, [ --enable-gzstream use wxGzipInputStream], wxUSE_GZSTREAM) WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL) WX_ARG_ENABLE(protocol, [ --enable-protocol use wxProtocol class], wxUSE_PROTOCOL) @@ -1347,6 +1347,18 @@ AC_PROG_CXX AC_LANG_RESTORE +dnl check if compiler includes /usr/local/include in +dnl default include files search path. +AC_MSG_CHECKING([for /usr/local/include in default include path]) +GCC_SEARCHES_USR_LOCAL_INCLUDE="no" +if test "$GCC" = "yes" ; then + echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include &1 /dev/null \ + && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes" +fi +AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE]) + dnl ranlib command dnl defines RANLIB with the appropriate command AC_PROG_RANLIB @@ -1464,15 +1476,20 @@ fi dnl not GNU make dnl needed for making link to setup.h AC_PROG_LN_S -dnl --------------------------------------------------------------------------- -dnl When we are using gcc on OS/2, we want to be either using resources (PM) -dnl or a more complete POSIX emulation for Motif/GTK+/X11 -dnl Moreover we need to link explicitly against either stdcpp.a or stdcxx.a -dnl (depending on compiler version), since we are using "gcc", not "g++/c++". -dnl --------------------------------------------------------------------------- -dnl (OS/2-only piece) +dnl ------------------------------------------------------------------------ +dnl Platform specific tests +dnl ------------------------------------------------------------------------ + case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) + dnl --------------------------------------------------------------------- + dnl When we are using gcc on OS/2, we want to be either using resources + dnl (PM) or a more complete POSIX emulation for Motif/GTK+/X11. + dnl Moreover we need to link explicitly against either stdcpp.a or + dnl stdcxx.a (depending on compiler version), since we are using "gcc", + dnl not "g++/c++". + dnl --------------------------------------------------------------------- + dnl (OS/2-only piece) if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then dnl More complete Unix emulation for unix-like ports dnl by linking in POSIX/2's cExt (if available). @@ -1481,7 +1498,7 @@ case "${host}" in dnl Include resources for the "native" port (wxPM). RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi - AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[ + AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[ AC_TRY_COMPILE([], [ #if (__GNUC__ < 3) @@ -1489,48 +1506,95 @@ case "${host}" in #endif ], [ - wx_cv_gcc3=yes + AC_TRY_COMPILE([], + [ + #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) + #error intermediate gcc + #endif + ], + [ + wx_cv_gccversion=Innotek + ], + [ + wx_cv_gccversion=3 + ] + ) ], [ - wx_cv_gcc3=no + wx_cv_gccversion=2 ] ) ]) - if test "$wx_cv_gcc3" = "no"; then + if test "$wx_cv_gccversion" = "2"; then LIBS="$LIBS -lstdcpp" + LDFLAGS="$LDFLAGS -Zsysv-signals" + else + if test "$wx_cv_gccversion" = "3"; then + LIBS="$LIBS -lstdcxx" + LDFLAGS="$LDFLAGS -Zsysv-signals" + else + LIBS="$LIBS -lstdc++" + fi + fi + if test "$wxUSE_OMF" = "yes"; then + LDFLAGS="$LDFLAGS -Zlinker /PMTYPE:PM -Zlinker /EXEPACK" + fi + dnl (end of OS/2-only piece) + ;; + *) + dnl --------------------------------------------------------------------- + dnl look for strcasecmp() in string.h and then strings.h if it's not + dnl there. Don't do this on OS/2, where "stricmp" is the function to be + dnl used. + dnl --------------------------------------------------------------------- + dnl (non-OS/2-only piece) + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [ + AC_TRY_LINK([ + #include + ], + [ + strcasecmp("foo", "bar"); + ], + ac_cv_string_strcasecmp=yes, + ac_cv_string_strcasecmp=no + ) + ]) + + if test x"$ac_cv_string_strcasecmp" = "xyes"; then + AC_DEFINE(HAVE_STRCASECMP_IN_STRING_H) else - LIBS="$LIBS -lstdcxx" + AC_CACHE_CHECK([for strcasecmp() in strings.h], ac_cv_strings_strcasecmp, [ + AC_TRY_LINK([ + #include + ], + [ + strcasecmp("foo", "bar"); + ], + ac_cv_strings_strcasecmp=yes, + ac_cv_strings_strcasecmp=no + ) + ]) + + if test x"$ac_cv_string_strcasecmp" = "xyes"; then + AC_DEFINE(HAVE_STRCASECMP_IN_STRINGS_H) + else + AC_MSG_ERROR([No case-insensitive string comparison function found.]) + fi fi + + AC_LANG_RESTORE + dnl (end of non-OS/2-only piece) ;; esac -dnl (end of OS/2-only piece) dnl ------------------------------------------------------------------------ dnl Check for headers dnl ------------------------------------------------------------------------ -dnl test for strings.h needed under AIX, but do not check for it wxMac as -dnl it exists but is only a simple redirection to string.h and it is in -dnl conflict with Strings.h in FlatCarbon headers -dnl -dnl Autoconf 2.5 tends to check for strings.h on its own, so avoiding the -dnl test (as the current configure script does) is not possible. Instead, -dnl you must remind autoconf that strings.h is NOT valid. The autoconf -dnl test succeeds because there is a strings.h file that simply includes -dnl string.h. Unfortunately, there is also a strings.h as part of the -dnl FlatCarbon headers. -- David Elliott -if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then - AC_CACHE_CHECK([for strings.h], ac_cv_header_strings_h, - [ac_cv_header_strings_h=no]) - if test "$ac_cv_header_strings_h" = "no"; then - AC_MSG_RESULT([forced no into cache]) - else - AC_MSG_WARN([strings.h is not compatible with Mac OS X]) - fi -fi -dnl defines HAVE_STRINGS_H -AC_CHECK_HEADERS(strings.h) - dnl defines HAVE_STDLIB_H AC_CHECK_HEADERS(stdlib.h) dnl defines HAVE_MALLOC_H @@ -1595,6 +1659,7 @@ AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(void *, 4) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) +AC_CHECK_SIZEOF(size_t, 4) case "${host}" in arm-*-linux* ) @@ -1688,6 +1753,7 @@ WX_CPP_EXPLICIT dnl check whether C++ compiler supports C++ casts AC_CXX_CONST_CAST +AC_CXX_STATIC_CAST dnl check various STL features if test "$wxUSE_STL" = "yes"; then @@ -1800,6 +1866,8 @@ SEARCH_INCLUDE="\ /usr/include/qt \ /usr/local/include/qt \ \ + /usr/local/arm/3.3.2/include \ + \ /usr/include/windows \ /usr/include/wine \ /usr/local/include/wine \ @@ -1811,8 +1879,13 @@ SEARCH_INCLUDE="\ \ /usr/openwin/share/include" +dnl prepend lib and lib32 for IRIX where the files in these directories should +dnl be found before the ones in lib64 for 32bit compilation -- of course, this +dnl probably/surely breaks 64bit compilation... IMO the only real solution is to +dnl stop using WX_PATH_FIND_LIBRARIES() at all and use AC_CHECK_LIB() instead +dnl dnl add 64 bit versions for Linux on AMD (this is not perfect but well...) -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64" +SEARCH_LIB="/usr/lib /usr/lib32 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64" dnl ------------------------------------------------------------------------ dnl Check for libraries @@ -1888,7 +1961,7 @@ if test "$wxUSE_REGEX" != "no"; then AC_DEFINE(wxUSE_REGEX) if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then - AC_MSG_WARN([Unicode build requires built-in regex library, will use it instead]) + AC_MSG_WARN([Defaulting to the the builtin regex library for Unicode build.]) wxUSE_REGEX=builtin fi @@ -1907,6 +1980,8 @@ if test "$wxUSE_REGEX" != "no"; then else dnl we are using the system library wxUSE_REGEX=sys + dnl only the built-in supports advanced REs + AC_DEFINE(WX_NO_REGEX_ADVANCED) fi fi fi @@ -2035,7 +2110,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then AC_CHECK_HEADER(png.h) if test "$ac_cv_header_png_h" = "yes"; then - AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm]) + AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm]) fi if test "x$PNG_LINK" = "x" ; then @@ -2277,6 +2352,7 @@ if test "$wxUSE_GUI" = "yes"; then WXGTK12= WXGTK127= WXGTK20= + WXGPE= if test "$wxUSE_MSW" = 1 ; then TOOLKIT=MSW @@ -2393,6 +2469,33 @@ equivalent variable and GTK+ is version 1.2.3 or above. dnl test for XIM support in libgdk AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) + + + dnl test for external libxpm if we're configured to use it + if test "$wxUSE_GPE" = "yes"; then + AC_MSG_CHECKING(for gpewidget library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + dnl -lgpewidget must be before all GTK libs and + dnl we guess its path from the prefix + GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY" + WXGPE=1 + AC_MSG_RESULT(found at $ac_find_libraries) + else + AC_MSG_RESULT(not found) + fi + + dnl AC_MSG_CHECKING(for gpe library) + dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe) + dnl if test "$ac_find_libraries" != "" ; then + dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe" + dnl AC_MSG_RESULT(found at $ac_find_libraries) + dnl else + dnl AC_MSG_RESULT(not found) + dnl fi + fi fi if test "$wxUSE_MGL" = 1; then @@ -2800,9 +2903,9 @@ equivalent variable and GTK+ is version 1.2.3 or above. AC_MSG_RESULT([none]) fi - CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon" + CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon" - TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex" + TOOLKIT_VPATH="\${top_srcdir}/src/mac/carbon${PATH_IFS}\${top_srcdir}/src/mac/carbon/morefilex" TOOLKIT=MAC dnl we can't call this MAC_DIST or autoconf thinks its a macro GUIDIST=MACX_DIST @@ -2969,9 +3072,13 @@ if test "$wxUSE_ZLIB" = "builtin" ; then fi dnl --------------------------------------------------------------------------- -dnl Xinerama (for unix wxDisplay) - Brian Victor +dnl wxDisplay Sanity checks dnl --------------------------------------------------------------------------- + if test "$wxUSE_DISPLAY" = "yes"; then +dnl --------------------------------------------------------------------------- +dnl Xinerama (for unix ) - Brian Victor +dnl --------------------------------------------------------------------------- if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1; then AC_MSG_CHECKING([for Xinerama]) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama) @@ -3003,9 +3110,17 @@ if test "$wxUSE_DISPLAY" = "yes"; then else AC_MSG_RESULT([no]) - AC_MSG_WARN("*** Xinerama not found; disabling wxDisplay") + AC_MSG_WARN([Xinerama not found; disabling wxDisplay]) wxUSE_DISPLAY="no" fi + elif test "$wxUSE_MSW" = 1; then +dnl --------------------------------------------------------------------------- +dnl DirectDraw / Multimon for MSW +dnl --------------------------------------------------------------------------- + AC_CHECK_HEADERS([multimon.h ddraw.h], [], [ + wxUSE_DISPLAY="no" + AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay]) + ] ) fi fi @@ -3191,7 +3306,6 @@ dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP --- if test "$wxUSE_SHARED" = "yes"; then case "${host}" in - *-pc-os2_emx | *-pc-os2-emx | \ *-pc-msdosdjgpp ) dnl only static for now wxUSE_SHARED=no @@ -3264,6 +3378,10 @@ EOF chmod +x change-install-names ;; + *-*-cygwin* | *-*-mingw32* ) + TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" + ;; + esac dnl set target to shared if not explicitly chose static before @@ -3470,6 +3588,11 @@ if test "$wx_cv_sizeof_wchar_t" != "0"; then AC_DEFINE(HAVE_WCSLEN) fi + dnl HP-UX aCC needs this define to find mbstrtowcs() &c + if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then + CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE " + fi + dnl try to use wcsrtombs instead of wcstombs which is buggy in old GNU dnl libc versions if possible AC_CHECK_FUNCS(wcsrtombs) @@ -3998,6 +4121,10 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then if test "x$GCC" != "xyes"; then dnl see http://docs.hp.com/hpux/onlinedocs/2213/threads.htm flag="$flag -D_RWSTD_MULTI_THREAD" + + dnl we also need -lcma for user threads (-lpthread is for + dnl kernel threads only) according to Ian Brown + LIBS="$LIBS -lcma" fi ;; *solaris* | alpha*-osf*) @@ -4204,6 +4331,10 @@ if test "$WXGTK127" = 1 ; then AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127) fi +if test "$WXGPE" = 1 ; then + AC_DEFINE_UNQUOTED(__WXGPE__,$WXGPE) +fi + WXDEBUG= if test "$wxUSE_DEBUG_INFO" = "yes" ; then @@ -4514,10 +4645,6 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then AC_DEFINE(wxUSE_ZIPSTREAM) fi -if test "$wxUSE_GZSTREAM" = "yes"; then - AC_DEFINE(wxUSE_GZSTREAM) -fi - if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION) fi @@ -4916,7 +5043,6 @@ if test "$wxUSE_GUI" = "yes"; then fi - dnl --------------------------------------------------------------------------- dnl String stuff dnl --------------------------------------------------------------------------- @@ -5116,11 +5242,14 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then if test "$wxUSE_DRAG_AND_DROP" = "yes"; then AC_DEFINE(wxUSE_DRAG_AND_DROP) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" fi fi +if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" +fi + if test "$wxUSE_SPLINES" = "yes" ; then AC_DEFINE(wxUSE_SPLINES) fi @@ -5314,7 +5443,7 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then fi if test "$wxUSE_TOGGLEBTN" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then + if test "$wxUSE_COCOA" = 1 ; then AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled]) wxUSE_TOGGLEBTN=no fi @@ -5757,7 +5886,7 @@ WXCONFIG_EXTRALIBS="$LIBS" dnl wx-config must output builtin 3rd party libs in --libs in static build: if test "$wxUSE_REGEX" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty regex" + wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}" fi if test "$wxUSE_EXPAT" = "builtin" ; then wxconfig_3rdparty="$wxconfig_3rdparty expat" @@ -5850,6 +5979,8 @@ AC_SUBST(TOOLKIT_VERSION) AC_SUBST(SAMPLES_RPATH_FLAG) AC_SUBST(SAMPLES_RPATH_POSTLINK) AC_SUBST(HOST_SUFFIX) +AC_SUBST(CPPUNIT_CFLAGS) +AC_SUBST(CPPUNIT_LIBS) AC_BAKEFILE @@ -5983,6 +6114,7 @@ AC_SUBST(MACRESWXCONFIG) dnl other tools AC_SUBST(GCC) +AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE) AC_SUBST(DLLTOOL) AC_SUBST(AS) AC_SUBST(NM) @@ -6061,6 +6193,8 @@ else dnl we build wxBase only dnl there are no wxBase programs in contrib nor demos SUBDIRS="samples utils" fi +dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected +AM_PATH_CPPUNIT(1.8.0, SUBDIRS="$SUBDIRS tests") for subdir in `echo $SUBDIRS`; do if test -d ${srcdir}/${subdir} ; then @@ -6082,11 +6216,13 @@ for subdir in `echo $SUBDIRS`; do dnl wxBase if test ${subdir} = "samples"; then makefiles="samples/Makefile.in samples/console/Makefile.in" - else dnl utils + elif test ${subdir} = "utils"; then makefiles="utils/HelpGen/Makefile.in \ utils/HelpGen/src/Makefile.in \ utils/tex2rtf/Makefile.in \ utils/tex2rtf/src/Makefile.in" + else dnl assume that everything compiles for tests + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` fi fi