* configure.in (LDFLAGS): prepend -L. instead appending it to

XLDFLAGS.  [ruby-core:10933]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,8 @@
+Wed Apr 18 02:17:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LDFLAGS): prepend -L. instead appending it to
+	  XLDFLAGS.  [ruby-core:10933]
+
 Mon Apr 16 22:56:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/pty/expect_sample.rb: avoid symbolic link representation for

configure.in

@@ -151,6 +151,11 @@ fi
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_GCC_TRADITIONAL
+if test "$GCC" = yes; then
+    linker_flag=-Wl,
+else
+    linker_flag=
+fi
 
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
@@ -1030,15 +1035,12 @@ if test "$with_dln_a_out" != yes; then
 			rb_cv_dlopen=yes ;;
         aix*)           if test "$GCC" = yes; then
 			    : ${LDSHARED='$(CC) -shared'}
-			    DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
-			    LDFLAGS='-Wl,-brtl'
-			    XLDFLAGS='-Wl,-bE:ruby.imp'
 			else
 			    : ${LDSHARED='/usr/ccs/bin/ld'}
-			    DLDFLAGS='-G -eInit_$(TARGET)'
-			    LDFLAGS='-brtl'
-			    XLDFLAGS='-bE:ruby.imp'
 			fi
+			DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
+			LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
+			XLDFLAGS="${linker_flag}-bE:ruby.imp"
 			: ${ARCHFILE="ruby.imp"}
                         TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
                         TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
@@ -1084,11 +1086,7 @@ if test "$with_dln_a_out" != yes; then
        [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
   if test "$enable_rpath" = yes; then
     LIBPATHFLAG=" -L'%1\$-s'"
-    if test "$GCC" = yes; then
+    RPATHFLAG=" ${linker_flag}-R'%1\$-s'"
-       RPATHFLAG=" -Wl,-R'%1\$-s'"
-    else
-       RPATHFLAG=" -R'%1\$-s'"
-    fi
   fi
 fi
 if test "${LDSHAREDXX}" = ""; then
@@ -1358,12 +1356,7 @@ if test "$enable_shared" = 'yes'; then
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
 	;;
     aix*)
-	if test "$GCC" = yes; then
+	LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
-	    LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bnoentry'
-	else
-	    LIBRUBY_DLDFLAGS='-G -bnoentry'
-	fi
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS $XLDFLAGS"
 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
 	SOLIBS='-lm -lc'
 	;;
@@ -1381,21 +1374,17 @@ if test "$enable_shared" = 'yes'; then
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
 	;;
     interix*)
-	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
+	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
 	;;
     *)
 	;;
   esac
 fi
 if test "$enable_rpath" = yes; then
-    if test "$GCC" = yes; then
+    LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L. -L\$(libdir) $LIBRUBYARG_SHARED"
-    LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-    else
-       LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-    fi
 fi
 
-XLDFLAGS="$XLDFLAGS -L."
+LDFLAGS="-L. $LDFLAGS"
 AC_SUBST(ARCHFILE)
 
 dnl build rdoc index if requested

version.h

@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-04-16"
+#define RUBY_RELEASE_DATE "2007-04-18"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070416
+#define RUBY_RELEASE_CODE 20070418
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 18
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];