Commit a862ef73 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/cw/mysql-4.1


configure.in:
  Auto merged
parents d4432343 05a945ec

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -145,8 +145,11 @@ AC_ARG_WITH(darwin-mwcc, 
  export CC CXX LD AR RANLIB

  AC_SUBST(AR)

  AC_SUBST(RANLIB)

  with_darwin_mwcc=yes

])



AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)



if test "x${CFLAGS-}" = x ; then

  cflags_is_set=no

else

libmysqld/Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ 
# generate a total libmysqld.a from all library files,



libmysqld.a:	libmysqld_int.a $(INC_LIB)

if DARWIN_MWCC

	mwld -lib -o $@ libmysqld_int.a `ls -1 $(INC_LIB) | sort -u`

else

		if test "$(host_os)" = "netware" ; \

		then \

		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
@@ -104,7 +107,7 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) 
		  rm -f tmp/* ; \

		  $(RANLIB) libmysqld.a	; \

		fi



endif



## XXX: any time the client interface changes, we'll need to bump

## the version info for libmysqld; however, it's possible for the