Add appropriate archname appendages in configure.com.
authorCraig A. Berry <craigberry@mac.com>
Sun, 6 Mar 2011 22:07:30 +0000 (16:07 -0600)
committerCraig A. Berry <craigberry@mac.com>
Mon, 7 Mar 2011 02:57:52 +0000 (20:57 -0600)
Now that we have the relevant questions answered before we set
archname, add the appropriate components to archname at the right
time so they'll become part of the architecture-specific
directory names.

FIXME: We don't (yet) set archname64, so at present we're not
adding it to archname.

configure.com

index cdd8bcb..f9cc2fb 100644 (file)
@@ -2382,6 +2382,43 @@ $   THEN
 $     echo4 "I'll go with ''archname' anyway..."
 $   ENDIF
 $ ENDIF
+$!
+$ IF usethreads .OR. usethreads .EQS. "define"
+$ THEN
+$   echo4 "Threads selected."
+$   IF F$LOCATE("-thread", archname) .EQ. F$LENGTH(archname)
+$   THEN
+$     archname = "''archname'-thread"
+$     echo4 "...setting architecture name to ''archname'."
+$   ELSE
+$     echo4 "...and architecture name already has -thread."
+$   ENDIF
+$ ENDIF
+$!
+$ IF usemultiplicity .OR. usemultiplicity .EQS. "define"
+$ THEN
+$   echo4 "Multiplicity selected."
+$   IF F$LOCATE("-multi", archname) .EQ. F$LENGTH(archname)
+$   THEN
+$     archname = "''archname'-multi"
+$     echo4 "...setting architecture name to ''archname'."
+$   ELSE
+$     echo4 "...and architecture name already has -multi."
+$   ENDIF
+$ ENDIF
+$!
+$ IF uselongdouble .OR. uselongdouble .EQS. "define"
+$ THEN
+$   echo4 "Long doubles selected."
+$   IF F$LOCATE("-ld", archname) .EQ. F$LENGTH(archname)
+$   THEN
+$     archname = "''archname'-ld"
+$     echo4 "...setting architecture name to ''archname'."
+$   ELSE
+$     echo4 "...and architecture name already has -ld."
+$   ENDIF
+$ ENDIF
+$!
 $ bool_dflt = "n"
 $ vms_prefix = "perl_root"
 $ vms_prefixup = F$EDIT(vms_prefix,"UPCASE")
@@ -3382,15 +3419,11 @@ $ IF use_threads
 $ THEN
 $   IF use_5005_threads
 $   THEN
-$     arch = "''arch'-thread"
-$     archname = "''archname'-thread"
 $     d_old_pthread_create_joinable = "undef"
 $     old_pthread_create_joinable = " "
 $     use5005threads = "define"
 $     useithreads = "undef"
 $   ELSE
-$     arch = "''arch'-ithread"
-$     archname = "''archname'-ithread"
 $     d_old_pthread_create_joinable = "undef"
 $     old_pthread_create_joinable = " "
 $     use5005threads = "undef"