Mercurial > vim

comparison src/configure.in @ 692:a28f83d37113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0208
author vimboss
date Mon, 27 Feb 2006 00:08:02 +0000
parents d7e33248b9c8
children f08390485cd3
comparison
equal deleted inserted replaced
691:8106f3da02d0 692:a28f83d37113
100 fi 100 fi
101 else 101 else
102 AC_MSG_RESULT([yes, Darwin support excluded]) 102 AC_MSG_RESULT([yes, Darwin support excluded])
103 fi 103 fi
104 104
105 AC_MSG_CHECKING(--with-mac-arch argument)
106 AC_ARG_WITH(mac-arch, [ --with-mac-arch=ARCH intel, ppc or both],
107 MACARCH="$withval"; AC_MSG_RESULT($MACARCH),
108 MACARCH="both"; AC_MSG_RESULT(Defaulting to $MACARCH))
109
110 if test "x$MACARCH" = "xboth"; then
111 AC_MSG_CHECKING(if both architectures are supported)
112 save_cppflags="$CPPFLAGS"
113 save_ldflags="$LDFLAGS"
114 CPPFLAGS="$CPPFLAGS -arch i386 -arch ppc"
115 LDFLAGS="$LDFLAGS -arch i386 -arch ppc"
116 AC_TRY_LINK([ ], [ ],
117 AC_MSG_RESULT(yes),
118 AC_MSG_RESULT(no)
119 AC_MSG_CHECKING(if Intel architecture is supported)
120 CPPFLAGS="$save_cppflags -arch i386"
121 LDFLAGS="$save_ldflags -arch i386"
122 AC_TRY_LINK([ ], [ ],
123 AC_MSG_RESULT(yes); MACARCH="intel",
124 AC_MSG_RESULT(no); MACARCH="ppc"))
125 CPPFLAGS="$save_cppflags"
126 LDFLAGS="$save_ldflags"
127 fi
128
129 case "$MACARCH" in
130 intel) MAC_OSX_ARCH="-arch i386";;
131 both) MAC_OSX_ARCH="-arch i386 -arch ppc";;
132 ppc) MAC_OSX_ARCH="-arch ppc";;
133 *) MAC_OSX_ARCH="";;
134 esac
135
136 dnl avoid a bug with -O2 for intel
137 if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
138 CFLAGS=`echo "$CFLAGS" | sed 's/-O[[23456789]]/-O/'`
139 fi
140
141 CPPFLAGS="$CPPFLAGS $MAC_OSX_ARCH"
142 LDFLAGS="$LDFLAGS $MAC_OSX_ARCH"
143
105 if test "$enable_darwin" = "yes"; then 144 if test "$enable_darwin" = "yes"; then
106 MACOSX=yes 145 MACOSX=yes
107 OS_EXTRA_SCR="os_macosx.c os_mac_conv.c"; 146 OS_EXTRA_SCR="os_macosx.c os_mac_conv.c";
108 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" 147 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
109 dnl TODO: use -arch i386 on Intel machines 148 dnl TODO: use -arch i386 on Intel machines
110 CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp -arch ppc" 149 CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp"
111 150
112 dnl If Carbon is found, assume we don't want X11 151 dnl If Carbon is found, assume we don't want X11
113 dnl unless it was specifically asked for (--with-x) 152 dnl unless it was specifically asked for (--with-x)
114 dnl or Motif, Athena or GTK GUI is used. 153 dnl or Motif, Athena or GTK GUI is used.
115 AC_CHECK_HEADER(Carbon/Carbon.h, CARBON=yes) 154 AC_CHECK_HEADER(Carbon/Carbon.h, CARBON=yes)
117 if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk -a "X$enable_gui" != Xgtk2; then 156 if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk -a "X$enable_gui" != Xgtk2; then
118 with_x=no 157 with_x=no
119 fi 158 fi
120 fi 159 fi
121 fi 160 fi
161
122 else 162 else
123 AC_MSG_RESULT(no) 163 AC_MSG_RESULT(no)
124 fi 164 fi
125 165
126 AC_SUBST(OS_EXTRA_SRC) 166 AC_SUBST(OS_EXTRA_SRC)