Skip to content

Commit

Permalink
- fix IPV6 and IDN options
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrejoye committed Jan 26, 2012
1 parent 00e615d commit 575f3c3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions winbuild/Makefile.vc
Expand Up @@ -26,7 +26,7 @@ CFGSET=true
!MESSAGE USE_SSSPI=<yes or no> - Enable SSPI support, default to yes
!MESSAGE ENABLE_IPV6=<yes or no> - Enable IPV6, default to yes
!MESSAGE DEBUG=<yes or no> - Debug builds
!MESSAGE ENABLE_IDN=<yes or no> - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.
!MESSAGE ENABLE_IDN=<yes or no> - Wheter or not to use IDN Windows APIs. Requires Windows Vista or later.
!MESSAGE or to install http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815
!MESSAGE GEN_PDB=<yes or no> - Generate Program Database (debug symbols release build)
!ERROR please choose a valid mode
Expand All @@ -50,9 +50,9 @@ USE_SSPI=true
!ENDIF

!IFNDEF ENABLE_IPV6
USE_IPV6 =true
USE_IPV6 = true
!ELSEIF "$(ENABLE_IPV6)"=="yes"
USE_IPV6 =true
USE_IPV6 = true
!ENDIF

!IFNDEF ENABLE_IDN
Expand Down
4 changes: 2 additions & 2 deletions winbuild/MakefileBuild.vc
Expand Up @@ -149,10 +149,10 @@ USE_SSPI=true
!ENDIF

!IFNDEF USE_IPV6
USE_IPV6=yes
USE_IPV6=true
!ENDIF

!IFNDEF USE_IDN
!IFNDEF ENABLE_IDN
USE_IDN =true
!ELSEIF "$(USE_IDN)"=="yes"
USE_IDN =true
Expand Down

2 comments on commit 575f3c3

@Jan-E
Copy link
Contributor

@Jan-E Jan-E commented on 575f3c3 May 21, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change from 'yes' to 'true' in line 152 of winbuild/MakefileBuild.vc must be applied to line 166 as well.

Line 166:
!IF "$(USE_IPV6)"=="yes"

Should be
!IF "$(USE_IPV6)"=="true"

Otherwise IPv6 support will be disabled on Windows at all times.

@bagder
Copy link
Member

@bagder bagder commented on 575f3c3 May 22, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merged!

Please sign in to comment.