From 08460462006d3d3a050317476fff4c8961da01c5 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Fri, 29 Jun 2001 09:30:01 -0400
Subject: [PATCH] BUG: break up CMAKE_AR into program and ARGS

---
 Source/cmUnixMakefileGenerator.cxx   | 3 ++-
 Templates/CMakeSystemConfig.cmake.in | 2 ++
 Templates/configure                  | 6 +++++-
 Templates/configure.in               | 5 ++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx
index dc7993ab6..3b3969073 100644
--- a/Source/cmUnixMakefileGenerator.cxx
+++ b/Source/cmUnixMakefileGenerator.cxx
@@ -501,7 +501,7 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout)
       fout << "#\n";
       fout << m_LibraryOutputPath << "lib" << l->first << ".a: ${" << 
         l->first << "_SRC_OBJS} \n";
-      fout << "\t${CMAKE_AR} "
+      fout << "\t${CMAKE_AR} ${CMAKE_AR_ARGS} "
            << m_LibraryOutputPath << "lib" << l->first << ".a ${" << 
         l->first << "_SRC_OBJS} \n";
       fout << "\t${CMAKE_RANLIB} "
@@ -951,6 +951,7 @@ void cmUnixMakefileGenerator::OutputMakeVariables(std::ostream& fout)
     "CMAKE_LIB_EXT       = @CMAKE_LIB_EXT@\n"
     "CMAKE_RANLIB        = @CMAKE_RANLIB@\n"
     "CMAKE_AR            = @CMAKE_AR@\n"
+    "CMAKE_AR_ARGS       = @CMAKE_AR_ARGS@\n"
     "CMAKE_C_COMPILER    = @CMAKE_C_COMPILER@\n"
     "CMAKE_CFLAGS        = @CMAKE_C_FLAGS@ @CMAKE_SHLIB_CFLAGS@ \n"
     "\n"
diff --git a/Templates/CMakeSystemConfig.cmake.in b/Templates/CMakeSystemConfig.cmake.in
index d849b10ac..46c4e2e2d 100644
--- a/Templates/CMakeSystemConfig.cmake.in
+++ b/Templates/CMakeSystemConfig.cmake.in
@@ -16,6 +16,8 @@ SET (CMAKE_RANLIB             "@RANLIB@" CACHE FILEPATH
         " Library randomizer program used on archive libraries." )
 SET (CMAKE_AR                 "@CMAKE_AR@" CACHE FILEPATH 
         " Archive program used to make archive libraries." )
+SET (CMAKE_AR_ARGS            "@CMAKE_AR_ARGS@" CACHE STRING 
+        " Arguments for CMAKE_AR program to create an archive library." )
 SET (CMAKE_CXX_COMPILER       "@CXX@" CACHE FILEPATH "CXX compiler used.")
 SET (CMAKE_CXX_FLAGS          "@CXXFLAGS@" CACHE STRING 
         "Flags used by CXX compiler")
diff --git a/Templates/configure b/Templates/configure
index ff3784d98..e90fc783b 100755
--- a/Templates/configure
+++ b/Templates/configure
@@ -3045,7 +3045,8 @@ fi
 test -n "$CMAKE_AR_TMP" && break
 done
 
-CMAKE_AR="$CMAKE_AR_TMP cr"
+CMAKE_AR="$CMAKE_AR_TMP"
+CMAKE_AR_ARGS="cr"
 # if on SunOS and not using gXX then use the compiler to make .a libs
 case $system in 
    SunOS-5*)
@@ -3054,10 +3055,12 @@ case $system in
    else
       echo "Using $CXX -xar -o for creating .a libraries"
       CMAKE_AR="$CXX -xar -o"
+      CMAKE_AR_ARGS="-xar -o"
    fi
 esac
 
 
+
 # generate output files.
 # create mkdir files just to make some of the directories
 
@@ -3243,6 +3246,7 @@ s%@CMAKE_NO_ANSI_STREAM_HEADERS@%$CMAKE_NO_ANSI_STREAM_HEADERS%g
 s%@RUNMAKE@%$RUNMAKE%g
 s%@CMAKE_AR_TMP@%$CMAKE_AR_TMP%g
 s%@CMAKE_AR@%$CMAKE_AR%g
+s%@CMAKE_AR_ARGS@%$CMAKE_AR_ARGS%g
 
 CEOF
 EOF
diff --git a/Templates/configure.in b/Templates/configure.in
index f75b573f4..5699375d9 100644
--- a/Templates/configure.in
+++ b/Templates/configure.in
@@ -542,7 +542,8 @@ fi
 # find make to use to build cmake, prefer gmake
 AC_PATH_PROGS(RUNMAKE, gmake make)
 AC_PATH_PROGS(CMAKE_AR_TMP, ar)
-CMAKE_AR="$CMAKE_AR_TMP cr"
+CMAKE_AR="$CMAKE_AR_TMP"
+CMAKE_AR_ARGS="cr"
 # if on SunOS and not using gXX then use the compiler to make .a libs
 case $system in 
    SunOS-5*)
@@ -551,9 +552,11 @@ case $system in
    else
       echo "Using $CXX -xar -o for creating .a libraries"
       CMAKE_AR="$CXX -xar -o"
+      CMAKE_AR_ARGS="-xar -o"
    fi
 esac
 AC_SUBST(CMAKE_AR)
+AC_SUBST(CMAKE_AR_ARGS)
 
 # generate output files.
 # create mkdir files just to make some of the directories