Resolve conflict.

CVS patchset: 5809
CVS date: 2002/10/23 16:20:17

diff --git a/elfutils/configure.ac b/elfutils/configure.ac
index 30f7cd1fc5a934f67518e2edb98df166f4d3becb..dfbcc1699ff99c349779eda7932fee6a4ec1cab2 100644 (file)
--- a/elfutils/configure.ac
+++ b/elfutils/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl
-AC_INIT([elfutils],[0.51],[drepper@redhat.com],[elfutils])
+AC_INIT([elfutils],[0.52],[drepper@redhat.com],[elfutils])
 AM_INIT_AUTOMAKE([gnits 1.6.3 dist-bzip2])
 AC_COPYRIGHT([Copyright (C) 1996-2001, 2002 Red Hat, Inc.])
 AC_CONFIG_SRCDIR([libelf/elf_begin.c])
@@ -121,7 +121,7 @@ AH_BOTTOM([
 #endif
 
 /* Avoid PLT entries.  */
-#if defined __PIC__ && defined __GNUC__
+#if defined PIC && defined __GNUC__
 # define INTUSE(name) _INTUSE(name)
 # define _INTUSE(name) __##name##_internal
 # define INTDEF(name) _INTDEF(name)