Use 'cp -pR' as a fallback for lndir, remove $(shell) construct from makefile.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 9798f077167b29ee979faf8eaadba62715a4b755..e87d268911afd1d9152f994017801150d6af5b17 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24381,7 +24381,7 @@ sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
 
 ############################# Dirs #################################
 
 
 ############################# Dirs #################################
 

-WXDIR = $(shell echo $(top_srcdir) | grep '^/' || echo `pwd`/$(top_srcdir) )
+WXDIR = @abs_top_srcdir@

 
 # Subordinate library possibilities
 
 
 # Subordinate library possibilities
 


@@ -24436,6 +24436,11 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2
 DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
 DISTDIR=./_dist_dir/$(DISTDIRNAME)
 
 DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
 DISTDIR=./_dist_dir/$(DISTDIRNAME)
 

+########################## Tools ###############################
+
+# lndir can be used if available instead of copying
+LNDIR = @LNDIR@
+CP_PR = @CP_PR@

 
 ########################## make dist rules ###############################
 
 
 ########################## make dist rules ###############################
 


@@ -24485,8 +24490,8 @@ ALL_DIST: distrib_clean
        ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex

-       mkdir $(DISTDIR)/src/expat
-       lndir $(EXPATDIR) $(DISTDIR)/src/expat
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/src/expat
+       $(LNDIR) $(EXPATDIR) $(DISTDIR)/src/expat

        #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
        mkdir $(DISTDIR)/src/iodbc
        ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
        mkdir $(DISTDIR)/src/iodbc
        ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc


@@ -24632,8 +24637,8 @@ GTK_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
 
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
 

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 X11_DIST: ALL_GUI_DIST UNIV_DIST
        ln -sf $(WXDIR)/wxX11.spec $(DISTDIR)
 
 X11_DIST: ALL_GUI_DIST UNIV_DIST
        ln -sf $(WXDIR)/wxX11.spec $(DISTDIR)


@@ -24647,8 +24652,8 @@ X11_DIST: ALL_GUI_DIST UNIV_DIST
        mkdir $(DISTDIR)/include/wx/mac
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
        mkdir $(DISTDIR)/include/wx/mac
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 MOTIF_DIST: ALL_GUI_DIST
        ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST
        ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR)


@@ -24667,8 +24672,8 @@ MOTIF_DIST: ALL_GUI_DIST
        ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
                $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11
        ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
                $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 MACX_DIST: ALL_GUI_DIST
        ln -sf $(INCDIR)/*.* $(DISTDIR)/include
 
 MACX_DIST: ALL_GUI_DIST
        ln -sf $(INCDIR)/*.* $(DISTDIR)/include


@@ -24700,8 +24705,8 @@ MACX_DIST: ALL_GUI_DIST
        ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 # TODO: Distribute some files
 COCOA_DIST: ALL_GUI_DIST
 
 # TODO: Distribute some files
 COCOA_DIST: ALL_GUI_DIST


@@ -24745,8 +24750,8 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
        ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
        ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src
        ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src
        ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
        ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src
        ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 UNIV_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/univ
 
 UNIV_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/univ


@@ -24766,8 +24771,8 @@ MGL_DIST: UNIV_DIST
        ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
        mkdir $(DISTDIR)/src/msdos
        ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
        ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
        mkdir $(DISTDIR)/src/msdos
        ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 DEMOS_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/demos
 
 DEMOS_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/demos


@@ -24781,8 +24786,8 @@ DEMOS_DIST: ALL_GUI_DIST
        ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 
        ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 

-       mkdir $(DISTDIR)/demos/dbbrowse
-       lndir $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/demos/dbbrowse
+       $(LNDIR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse

 
        mkdir $(DISTDIR)/demos/forty
        ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
 
        mkdir $(DISTDIR)/demos/forty
        ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 0767450ab277da3ee21f194182389f4bde574077..89189847fbe3218141eb9a26a560d17eba2b5aef 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -5,7 +5,7 @@
 
 ############################# Dirs #################################
 
 
 ############################# Dirs #################################
 

-WXDIR = $(shell echo $(top_srcdir) | grep '^/' || echo `pwd`/$(top_srcdir) )
+WXDIR = @abs_top_srcdir@

 
 # Subordinate library possibilities
 
 
 # Subordinate library possibilities
 


@@ -60,6 +60,11 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2
 DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
 DISTDIR=./_dist_dir/$(DISTDIRNAME)
 
 DISTDIRNAME=@DISTDIR@-$(WX_VERSION)
 DISTDIR=./_dist_dir/$(DISTDIRNAME)
 

+########################## Tools ###############################
+
+# lndir can be used if available instead of copying
+LNDIR = @LNDIR@
+CP_PR = @CP_PR@

 
 ########################## make dist rules ###############################
 
 
 ########################## make dist rules ###############################
 


@@ -109,8 +114,8 @@ ALL_DIST: distrib_clean
        ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/*.c $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/COPYRIGHT $(DISTDIR)/src/regex
        ln -sf $(REGEXDIR)/README $(DISTDIR)/src/regex

-       mkdir $(DISTDIR)/src/expat
-       lndir $(EXPATDIR) $(DISTDIR)/src/expat
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/src/expat
+       $(LNDIR) $(EXPATDIR) $(DISTDIR)/src/expat

        #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
        mkdir $(DISTDIR)/src/iodbc
        ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc
        #(cd $(DISTDIR)/src/expat ; rm -rf `find -name CVS`)
        mkdir $(DISTDIR)/src/iodbc
        ln -sf $(ODBCDIR)/*.h $(DISTDIR)/src/iodbc


@@ -256,8 +261,8 @@ GTK_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
 
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
 

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 X11_DIST: ALL_GUI_DIST UNIV_DIST
        ln -sf $(WXDIR)/wxX11.spec $(DISTDIR)
 
 X11_DIST: ALL_GUI_DIST UNIV_DIST
        ln -sf $(WXDIR)/wxX11.spec $(DISTDIR)


@@ -271,8 +276,8 @@ X11_DIST: ALL_GUI_DIST UNIV_DIST
        mkdir $(DISTDIR)/include/wx/mac
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
        mkdir $(DISTDIR)/include/wx/mac
        mkdir $(DISTDIR)/include/wx/mac/corefoundation
        ln -sf $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 MOTIF_DIST: ALL_GUI_DIST
        ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST
        ln -sf $(WXDIR)/wxMotif.spec $(DISTDIR)


@@ -291,8 +296,8 @@ MOTIF_DIST: ALL_GUI_DIST
        ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
                $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11
        ln -sf $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
                $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
                $(DISTDIR)/include/wx/x11

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 MACX_DIST: ALL_GUI_DIST
        ln -sf $(INCDIR)/*.* $(DISTDIR)/include
 
 MACX_DIST: ALL_GUI_DIST
        ln -sf $(INCDIR)/*.* $(DISTDIR)/include


@@ -324,8 +329,8 @@ MACX_DIST: ALL_GUI_DIST
        ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
        ln -sf $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 # TODO: Distribute some files
 COCOA_DIST: ALL_GUI_DIST
 
 # TODO: Distribute some files
 COCOA_DIST: ALL_GUI_DIST


@@ -369,8 +374,8 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
        ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
        ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src
        ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src
        ln -sf $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
        ln -sf $(SRCDIR)/*.??? $(DISTDIR)/src
        ln -sf $(SRCDIR)/*.?? $(DISTDIR)/src

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 UNIV_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/univ
 
 UNIV_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/include/wx/univ


@@ -390,8 +395,8 @@ MGL_DIST: UNIV_DIST
        ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
        mkdir $(DISTDIR)/src/msdos
        ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
        ln -sf $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
        mkdir $(DISTDIR)/src/msdos
        ln -sf $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos

-       mkdir $(DISTDIR)/contrib
-       lndir $(WXDIR)/contrib $(DISTDIR)/contrib
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/contrib
+       $(LNDIR) $(WXDIR)/contrib $(DISTDIR)/contrib

 
 DEMOS_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/demos
 
 DEMOS_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/demos


@@ -405,8 +410,8 @@ DEMOS_DIST: ALL_GUI_DIST
        ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 
        ln -sf $(DEMODIR)/bombs/*.xpm $(DISTDIR)/demos/bombs
        ln -sf $(DEMODIR)/bombs/readme.txt $(DISTDIR)/demos/bombs
 

-       mkdir $(DISTDIR)/demos/dbbrowse
-       lndir $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse
+       test "$(LNDIR)" == "$(CP_PR)" || mkdir $(DISTDIR)/demos/dbbrowse
+       $(LNDIR) $(DEMODIR)/dbbrowse $(DISTDIR)/demos/dbbrowse

 
        mkdir $(DISTDIR)/demos/forty
        ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty
 
        mkdir $(DISTDIR)/demos/forty
        ln -sf $(DEMODIR)/forty/Makefile.in $(DISTDIR)/demos/forty

diff --git a/configure b/configure
index 9bfdd7b893189e88d91871740fbb0d53592194cf..184556c45dca3894eecf2e38b03aa9190f363198 100755 (executable)
--- a/configure
+++ b/configure
@@ -313,7 +313,7 @@ ac_includes_default="\
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP ac_ct_STRIP RESCOMP ac_ct_RESCOMP DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GST_INSPECT CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WINDOWS_IMPLIB_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP ac_ct_STRIP RESCOMP ac_ct_RESCOMP DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S LNDIR CP_PR CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GST_INSPECT CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WINDOWS_IMPLIB_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.
 ac_subst_files=''
 
 # Initialize some variables set by options.


@@ -14646,6 +14646,51 @@ echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 
 fi
 
 

+CP_PR='cp -pR'
+for ac_prog in lndir
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_LNDIR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$LNDIR"; then
+  ac_cv_prog_LNDIR="$LNDIR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LNDIR="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+LNDIR=$ac_cv_prog_LNDIR
+if test -n "$LNDIR"; then
+  echo "$as_me:$LINENO: result: $LNDIR" >&5
+echo "${ECHO_T}$LNDIR" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$LNDIR" && break
+done
+test -n "$LNDIR" || LNDIR="$CP_PR"
+
+
+
+

 
 if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
     CXXFLAGS="$CXXFLAGS -qunique"
 
 if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
     CXXFLAGS="$CXXFLAGS -qunique"


@@ -47261,6 +47306,8 @@ s,@DLLTOOL@,$DLLTOOL,;t t
 s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
 s,@IF_GNU_MAKE@,$IF_GNU_MAKE,;t t
 s,@LN_S@,$LN_S,;t t
 s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
 s,@IF_GNU_MAKE@,$IF_GNU_MAKE,;t t
 s,@LN_S@,$LN_S,;t t

+s,@LNDIR@,$LNDIR,;t t
+s,@CP_PR@,$CP_PR,;t t

 s,@CXXCPP@,$CXXCPP,;t t
 s,@subdirs@,$subdirs,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@CXXCPP@,$CXXCPP,;t t
 s,@subdirs@,$subdirs,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t

diff --git a/configure.in b/configure.in
index 6b302f2c87e47e500605b1bf4f6ba9a6bf245344..a61b1710fe21460d7fb426037e071a00c5b9f162 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1517,6 +1517,12 @@ fi dnl not GNU make
 dnl needed for making link to setup.h
 AC_PROG_LN_S
 
 dnl needed for making link to setup.h
 AC_PROG_LN_S
 

+dnl lndir can be used by "make dist" to save copying files
+CP_PR='cp -pR'
+AC_CHECK_PROGS(LNDIR, lndir, [$CP_PR])
+AC_SUBST(CP_PR)
+
+

 dnl ------------------------------------------------------------------------
 dnl Platform specific tests
 dnl ------------------------------------------------------------------------
 dnl ------------------------------------------------------------------------
 dnl Platform specific tests
 dnl ------------------------------------------------------------------------