oops... fix for the fix for config.status

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

diff --git a/configure b/configure
index 9361d3d29a1887696e475ab941ac5f24f604f087..48188bc9cd23cc9b2f9f39489e7e7c55667ea5b1 100755 (executable)
--- a/configure
+++ b/configure
@@ -16443,7 +16443,7 @@ cat >> $CONFIG_STATUS <<EOF
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 

-                                    if test ! -f wx${TOOLKIT_NAME}-config; then
+                                                if test ! -L wx-config; then

                 chmod +x wx-config
                 mv wx-config wx${TOOLKIT_NAME}-config
                 ${LN_S} wx${TOOLKIT_NAME}-config wx-config
                 chmod +x wx-config
                 mv wx-config wx${TOOLKIT_NAME}-config
                 ${LN_S} wx${TOOLKIT_NAME}-config wx-config

diff --git a/configure.in b/configure.in
index 819e4adad37fb1a9666ee3d78f63f19aa8b58f5c..e58f95be1b771ec295fc0f370420f59097a1dd78 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4292,9 +4292,10 @@ AC_OUTPUT([
             Makefile
           ],
           [
             Makefile
           ],
           [

-            dnl avoid to move the file again after we had already made it a
-            dnl link (moving the file to itself won't work anyhow)
-            if test ! -f wx${TOOLKIT_NAME}-config; then
+            dnl don't move the file on itself - this happens when we run
+            dnl config.status which, as configure, executes these commands
+            dnl but, unlike it, doesn't create wx-config
+            if test ! -L wx-config; then

                 chmod +x wx-config
                 mv wx-config wx${TOOLKIT_NAME}-config
                 ${LN_S} wx${TOOLKIT_NAME}-config wx-config
                 chmod +x wx-config
                 mv wx-config wx${TOOLKIT_NAME}-config
                 ${LN_S} wx${TOOLKIT_NAME}-config wx-config