Ticket #47872: patch-configure.diff

configure

@@ -1014 +1014 @@
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'
 mandir='${datarootdir}/man'
+uiddir='${exec_prefix}/uid'
 
 ac_prev=
 ac_dashdash=
@@ -7452 +7453 @@
        HUP_TO_INETD="kill -HUP \`/sbin/pidof inetd\`";;
 *apple-darwin*) echo "Configuring for MacOS X";
        MACOSX="macosx"
-       CFLAGS="$CFLAGS -arch x86_64 -arch i386 -dynamic";
+       CFLAGS="$CFLAGS -arch x86_64 -dynamic";
        if (test "$F77" = "f77"); then
           FFLAGS="$FFLAGS -w -f -V -W"
                   FORLD="$F77"
@@ -7475 +7476 @@
        LD_LDSHARE="";
        LDARC="";
        LD_LDARC="";
-       UILPATH=/usr/OpenMotif/bin;
-       MOTIF_LDARC="-Wl,-bind_at_load -multiply_defined suppress -L/usr/OpenMotif/lib"
-       MOTIF_LD_LDARC="-multiply_defined suppress -L/usr/OpenMotif/lib"
-                   LINKSHARED="$LDFLAGS -shared -arch i386 -arch x86_64";
+       UILPATH=${prefix}/bin;
+       MOTIF_LDARC="-Wl,-bind_at_load -multiply_defined suppress -L${prefix}/lib"
+       MOTIF_LD_LDARC="-multiply_defined suppress -L${prefix}/lib"
+                   LINKSHARED="$LDFLAGS -shared -arch x86_64 -dynamiclib -install_name $libdir/\$(@F) -headerpad_max_install_names"
            FOR_LINKSHARED="$LDFLAGS -shared";
            LINKMODULE="$LDFLAGS -bundle -undefined dynamic_lookup";
        IDL_LD="";
@@ -10606 +10607 @@
 
 case $host in #(
   *darwin*|*apple*) :
-    X_CFLAGS+=" -I/usr/OpenMotif/include"
-                             X_LIBS+=" -L/usr/OpenMotif/lib" ;; #(
+    X_CFLAGS+=" -I${prefix}/include"
+                             X_LIBS+=" -L${prefix}/lib" ;; #(
   *) :
      ;;
 esac