don't create version-script file if it's not used

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

diff --git a/acinclude.m4 b/acinclude.m4
index d2fb3cda6f4f4a32bcf6de799444b96180eff956..6a27a120d7f9dfe11859a5bf771c14eb38d943bf 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -544,7 +544,7 @@ AC_DEFUN([WX_VERSIONED_SYMBOLS],
             dnl to use it for cygwin/mingw32, keep in mind that replacing last
             dnl comma with the equal sign works) so
             dnl simply disable it
-            found_versioning=no
+            wx_cv_version_script=no
             ;;
 
         *)

diff --git a/configure b/configure
index 43c17e327e2327c953b0add28e1e5da031e73987..9afaf597480feb1dbe6a8634944c25ca5c85761f 100755 (executable)
--- a/configure
+++ b/configure
@@ -34014,7 +34014,7 @@ if test "$wxUSE_SHARED" = "yes"; then
 
     case "${host}" in
         *-*-cygwin* | *-*-mingw* )
-                                                                                                found_versioning=no
+                                                                                                wx_cv_version_script=no
             ;;
 
         *)
@@ -50945,7 +50945,11 @@ fi
           ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in"
 
 
-                    ac_config_files="$ac_config_files version-script Makefile"
+if test "$wx_cv_version_script" = "yes"; then
+              ac_config_files="$ac_config_files version-script"
+
+fi
+          ac_config_files="$ac_config_files Makefile"
 
 
           ac_config_commands="$ac_config_commands wx-config"

diff --git a/configure.in b/configure.in
index 94cc9304a5e313464bf86b2d817d863554bb4346..fa4495b463952d6a93d57b4d262333cd3601429c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7904,7 +7904,10 @@ AC_CONFIG_FILES([ lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.
                 [ chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ],
                 [ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" ])
 
-AC_CONFIG_FILES([ version-script Makefile ])
+if test "$wx_cv_version_script" = "yes"; then
+    AC_CONFIG_FILES(version-script)
+fi
+AC_CONFIG_FILES(Makefile)
 
 AC_CONFIG_COMMANDS([wx-config],
                    [ rm -f wx-config