branches/zip

This is to revert the changes made to the plug.in (r4251) as a fix for
issue# 178. Changes to plug.in will not propogate to a plugin
installation unless autotools are rerun which is unacceptable.

A fix for issue# 178 will be committed in a separate commit.

plug.in

@@ -28,29 +28,17 @@ MYSQL_PLUGIN_ACTIONS(innobase,  [
   AC_C_BIGENDIAN
   case "$target_os" in
 	lin*)
-		CFLAGS="$CFLAGS -DUNIV_LINUX"
-		CXXFLAGS="$CXXFLAGS -DUNIV_LINUX"
-		;;
+		CFLAGS="$CFLAGS -DUNIV_LINUX";;
 	hpux10*)
-		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10"
-		CXXFLAGS="$CXXFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10"
-		;;
+		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;
 	hp*)
-		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX"
-		CXXFLAGS="$CXXFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX"
-		;;
+		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;
 	aix*)
-		CFLAGS="$CFLAGS -DUNIV_AIX"
-		CXXFLAGS="$CXXFLAGS -DUNIV_AIX"
-		;;
+		CFLAGS="$CFLAGS -DUNIV_AIX";;
 	irix*|osf*|sysv5uw7*|openbsd*)
-		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE"
-		CXXFLAGS="$CXXFLAGS -DUNIV_MUST_NOT_INLINE"
-		;;
+		CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
 	*solaris*|*SunOS*)
-		CFLAGS="$CFLAGS -DUNIV_SOLARIS"
-		CXXFLAGS="$CXXFLAGS -DUNIV_SOLARIS"
-		;;
+		CFLAGS="$CFLAGS -DUNIV_SOLARIS";;
   esac
   INNODB_DYNAMIC_CFLAGS="-DMYSQL_DYNAMIC_PLUGIN"
   case "$target_cpu" in