[pacman-dev] CVS update of pacman-lib (configure.ac etc/pacman.conf.in)

[Aaron Griffin]

    Date: Monday, February 12, 2007 @ 19:57:08
  Author: aaron
    Path: /home/cvs-pacman/pacman-lib

Modified: configure.ac (1.30 -> 1.31) etc/pacman.conf.in (1.4 -> 1.5)

Fix some x86_64 configuration handling


--------------------+
 configure.ac       |    4 ++--
 etc/pacman.conf.in |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Index: pacman-lib/configure.ac
diff -u pacman-lib/configure.ac:1.30 pacman-lib/configure.ac:1.31
--- pacman-lib/configure.ac:1.30	Wed Feb  7 18:03:30 2007
+++ pacman-lib/configure.ac	Mon Feb 12 19:57:08 2007
@@ -70,10 +70,10 @@
 		CHOST="${host}"
 		;;
 	x86_64-*) AC_DEFINE_UNQUOTED([CARCH], ["x86_64"], [Architecture])
-		AC_DEFINE_UNQUOTED([CARCHFLAGS], ["k8"], [Architecture])
+		AC_DEFINE_UNQUOTED([CARCHFLAGS], ["x86-64"], [Architecture])
 		AC_DEFINE_UNQUOTED([MARCHFLAG], ["march"], [Architecture])
 		CARCH="x86_64"
-		CARCHFLAGS="k8"
+		CARCHFLAGS="x86-64"
 		MARCHFLAG="march"
 		CHOST="${host}"
 		;;
Index: pacman-lib/etc/pacman.conf.in
diff -u pacman-lib/etc/pacman.conf.in:1.4 pacman-lib/etc/pacman.conf.in:1.5
--- pacman-lib/etc/pacman.conf.in:1.4	Thu Jan 25 20:33:03 2007
+++ pacman-lib/etc/pacman.conf.in	Mon Feb 12 19:57:08 2007
@@ -25,7 +25,7 @@
 #     have identical names, regardless of version number
 #
 #[testing]
-#Server = ftp://ftp.archlinux.org/testing/os/i686
+#Server = ftp://ftp.archlinux.org/testing/os/@CARCH@
 
 [current]
 # Add your preferred servers here, they will be used first