From ec7ee6bba625081b61073e7967055121a9ff9d6f Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 16 Aug 2007 18:23:24 +0000 Subject: [PATCH] * libtool.m4 (AC_LIBTOOL_PROG_COMPILER_PIC): [ mingw, cygwin ] : Do not use -DDLL_EXPORT. Report by Ross Ridge . --- ChangeLog | 6 ++++++ libtool.m4 | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 555438542..5bd474e89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-08-16 Ralf Wildenhues + + * libtool.m4 (AC_LIBTOOL_PROG_COMPILER_PIC): [ mingw, cygwin ] + : Do not use -DDLL_EXPORT. + Report by Ross Ridge . + 2007-08-15 Dirk Mueller (tiny change) Ralf Wildenhues diff --git a/libtool.m4 b/libtool.m4 index 26d22ba4c..8c49f660d 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -4967,7 +4967,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -5251,7 +5252,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; darwin* | rhapsody*) @@ -5321,7 +5323,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' + m4_if([$1], [GCJ], [], + [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ;; hpux9* | hpux10* | hpux11*) -- 2.47.2